From 94420012e92a01651946524054172ac7f68ce870 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 4 Oct 2025 08:57:44 +0200 Subject: [PATCH] 20251004.1 global branch merge. Signed-off-by: Matteo Bernardini --- README | 16 + academic/EMBASSY/EMBASSY.SlackBuild | 3 + academic/WordNet/WordNet.SlackBuild | 2 +- academic/bedtools/bedtools.SlackBuild | 2 +- academic/bedtools/bedtools.info | 6 +- academic/cutadapt/cutadapt.SlackBuild | 4 +- academic/cutadapt/cutadapt.info | 6 +- academic/flexbar/flexbar.SlackBuild | 1 + academic/geda-gaf/geda-gaf.SlackBuild | 1 + academic/glpk/glpk.SlackBuild | 2 +- academic/labplot2/README | 23 - academic/labplot2/doinst.sh | 14 - academic/labplot2/labplot2.SlackBuild | 129 - academic/labplot2/labplot2.info | 10 - academic/labplot2/slack-desc | 19 - academic/metis/metis.SlackBuild | 1 + .../python3-scipy/python3-scipy.SlackBuild | 13 +- academic/python3-scipy/python3-scipy.info | 6 +- academic/qalculate-gtk/README | 10 - academic/qalculate-gtk/doinst.sh | 9 - .../qalculate-gtk/qalculate-gtk.SlackBuild | 111 - academic/qalculate-gtk/qalculate-gtk.info | 10 - academic/qalculate-gtk/slack-desc | 19 - academic/speedcrunch/speedcrunch.SlackBuild | 1 + academic/staden/staden.SlackBuild | 2 + academic/stellarium/stellarium.SlackBuild | 1 + academic/stellarsolver/README | 17 - academic/stellarsolver/doinst.sh | 7 - academic/stellarsolver/slack-desc | 19 - .../stellarsolver/stellarsolver.SlackBuild | 119 - academic/stellarsolver/stellarsolver.info | 10 - academic/suitesparse/README | 31 - academic/suitesparse/slack-desc | 19 - academic/suitesparse/suitesparse.SlackBuild | 111 - academic/suitesparse/suitesparse.info | 10 - academic/sundials/sundials.SlackBuild | 2 +- academic/veusz/veusz.SlackBuild | 7 +- academic/veusz/veusz.info | 6 +- accessibility/flite/flite.SlackBuild | 1 + accessibility/ydotool/ydotool.SlackBuild | 1 + audio/SuperCollider/SuperCollider.SlackBuild | 2 + ...ollider-3.12.2-libsndfile-110-compat.patch | 237 ++ audio/TiMidity++/TiMidity++.SlackBuild | 2 +- audio/apulse/apulse.SlackBuild | 1 + audio/audacity/audacity.SlackBuild | 6 +- audio/clementine/clementine.SlackBuild | 4 + audio/clementine/cmake4.patch | 32 + audio/flac-opt/README | 39 - audio/flac-opt/flac-opt-dev.sh | 15 - audio/flac-opt/flac-opt.SlackBuild | 147 - audio/flac-opt/flac-opt.info | 10 - audio/flac-opt/flac-opt.sh | 7 - audio/flac-opt/slack-desc | 19 - audio/guitarix/guitarix.SlackBuild | 2 + audio/guitarix/patches/always_inline.patch | 22 + audio/guitarix/patches/gcc-13.patch | 12 + audio/hydrogen/hydrogen.SlackBuild | 1 + audio/jack-rack/jack-rack.SlackBuild | 2 +- audio/jack/jack.SlackBuild | 2 + audio/jack/jack.info | 6 +- audio/jack_capture/gcc14.patch | 39 + audio/jack_capture/jack_capture.SlackBuild | 2 + audio/libebur128/libebur128.SlackBuild | 1 + audio/mpd/mpd.SlackBuild | 6 +- audio/mpd/mpd.info | 8 +- audio/mppenc/mppenc.SlackBuild | 1 + .../musepack-tools/musepack-tools.SlackBuild | 3 +- audio/musikcube/musikcube.SlackBuild | 2 + audio/ncmpcpp/ncmpcpp.SlackBuild | 12 +- audio/ncmpcpp/ncmpcpp.info | 8 +- audio/quodlibet/python3.12.patch | 72 + audio/quodlibet/quodlibet.SlackBuild | 1 + audio/soxr/soxr.SlackBuild | 1 + audio/wireplumber/README | 25 - audio/wireplumber/doinst.sh | 5 - audio/wireplumber/slack-desc | 19 - audio/wireplumber/wireplumber-disable.sh | 54 - audio/wireplumber/wireplumber-enable.sh | 42 - audio/wireplumber/wireplumber.SlackBuild | 147 - audio/wireplumber/wireplumber.desktop.sample | 10 - audio/wireplumber/wireplumber.info | 10 - business/ledger/boost-185.patch | 22 + business/ledger/ledger.SlackBuild | 1 + desktop/afterstep/afterstep.SlackBuild | 2 +- desktop/birdtray/birdtray.SlackBuild | 1 + desktop/cmatrix/cmatrix.SlackBuild | 37 +- desktop/cmatrix/cmatrix.info | 4 +- .../enlightenment/enlightenment.SlackBuild | 7 +- desktop/enlightenment/enlightenment.info | 6 +- desktop/flatpak/flatpak.SlackBuild | 41 +- desktop/flatpak/flatpak.info | 8 +- desktop/florence/florence-c99.patch | 32 + desktop/florence/florence.SlackBuild | 6 +- desktop/foot/foot.SlackBuild | 6 +- desktop/foot/foot.info | 6 +- desktop/glabels/glabels.SlackBuild | 2 +- desktop/labwc/README | 45 - desktop/labwc/doinst.sh | 3 - desktop/labwc/labwc.SlackBuild | 114 - desktop/labwc/labwc.info | 10 - desktop/labwc/slack-desc | 19 - desktop/libqtxdg/libqtxdg.SlackBuild | 1 + desktop/lxhotkey/lxhotkey.SlackBuild | 2 +- desktop/lxhotkey/lxhotkey.info | 8 +- desktop/macopix/macopix.SlackBuild | 2 +- desktop/murrine/gtk-murrine-engine-c99.patch | 634 +++ desktop/murrine/murrine.SlackBuild | 1 + desktop/obconf/obconf-c99.patch | 47 + desktop/obconf/obconf.SlackBuild | 2 + desktop/openbox/openbox.SlackBuild | 2 + ...7204_undecorated_maximized_no_border.patch | 22 + ...fdd71890c5cc43747f105382d5677e5d37e7.patch | 50 + desktop/openbox/patches/debian-887908.patch | 31 + desktop/polybar/polybar.SlackBuild | 9 +- desktop/polybar/polybar.info | 6 +- desktop/qlipper/qlipper.SlackBuild | 1 + desktop/redshift/redshift.SlackBuild | 8 +- desktop/river/README | 2 +- desktop/river/river.SlackBuild | 4 +- desktop/river/river.info | 8 +- desktop/river/slack-desc | 2 +- .../rofi/fix_xfce4-terminal_binary_name.patch | 13 + desktop/rofi/rofi.SlackBuild | 7 +- desktop/rofi/rofi.info | 6 +- desktop/sway/sway.SlackBuild | 3 +- desktop/sway/sway.info | 6 +- desktop/swaybg/swaybg.SlackBuild | 2 +- desktop/swaybg/swaybg.info | 6 +- desktop/tint2/tint2.SlackBuild | 3 + desktop/tint2/tint2conf-libm-1082699.patch | 16 + desktop/trayer-srg/trayer-srg.SlackBuild | 2 +- ...8577d1296323b637afc89524a00779776.patch.gz | Bin 713 -> 0 bytes desktop/waybar/waybar.SlackBuild | 10 +- desktop/waybar/waybar.info | 6 +- .../wmCalClock/1.26-fix-KnR-prototypes.patch | 43 + desktop/wmCalClock/wmCalClock.SlackBuild | 46 +- desktop/wmCalClock/wmCalClock.info | 8 +- desktop/wmMoonClock/wmMoonClock.SlackBuild | 53 +- desktop/wmMoonClock/wmMoonClock.info | 8 +- desktop/wmSun/wmSun.SlackBuild | 5 +- desktop/wmSunMoon/wmSunMoon.SlackBuild | 5 +- .../xdg-desktop-portal-gtk.SlackBuild | 33 +- .../xdg-desktop-portal-gtk.info | 8 +- .../xfce4-cpugraph-plugin.SlackBuild | 2 +- .../xfce4-cpugraph-plugin.info | 6 +- .../xfce4-sensors-plugin.SlackBuild | 2 +- .../xfce4-sensors-plugin.info | 6 +- .../xfce4-volumed-pulse.SlackBuild | 2 + desktop/xfce4-xkb-plugin/README | 2 - desktop/xfce4-xkb-plugin/slack-desc | 19 - .../xfce4-xkb-plugin.SlackBuild | 109 - .../xfce4-xkb-plugin/xfce4-xkb-plugin.info | 10 - desktop/xss-lock/xss-lock.SlackBuild | 5 +- desktop/zenity/README | 3 +- desktop/zenity/zenity.SlackBuild | 37 +- desktop/zenity/zenity.info | 8 +- development/Bear/Bear.SlackBuild | 4 + development/Coin/Coin.SlackBuild | 1 + .../OpenCL-CLHPP/OpenCL-CLHPP.SlackBuild | 1 + development/Pivy/Pivy.SlackBuild | 3 + development/SoQt/SoQt.SlackBuild | 1 + development/Sphinx/README | 5 - development/Sphinx/Sphinx.SlackBuild | 87 - development/Sphinx/Sphinx.info | 10 - development/Sphinx/slack-desc | 19 - development/UASM/UASM.SlackBuild | 2 +- development/abseil-cpp/README | 2 - development/abseil-cpp/abseil-cpp.SlackBuild | 100 - development/abseil-cpp/abseil-cpp.info | 10 - development/abseil-cpp/slack-desc | 19 - development/avr-gdb/avr-gdb.SlackBuild | 2 + development/avr-gdb/fix-const-compile.patch | 11 + development/bazel/abseil-missing-stdint.patch | 10 + development/bazel/apply-abseil-stdint.patch | 13 + development/bazel/bazel.SlackBuild | 4 + development/bluefish/README | 6 - development/bluefish/bluefish.SlackBuild | 7 +- development/bluefish/bluefish.info | 6 +- development/cJSON/cJSON.SlackBuild | 1 + development/cargo-c/README | 7 - development/cargo-c/cargo-c.SlackBuild | 165 - development/cargo-c/cargo-c.info | 678 ---- development/cargo-c/slack-desc | 19 - development/cargo-vendor-filterer/README | 10 - .../cargo-vendor-filterer/cargo-mkvendored.sh | 151 - .../cargo-vendor-filterer.SlackBuild | 132 - .../cargo-vendor-filterer.info | 12 - development/cargo-vendor-filterer/slack-desc | 19 - development/codelite/codelite.SlackBuild | 4 +- development/codelite/codelite.info | 6 +- .../edb-debugger/edb-debugger.SlackBuild | 1 + .../gambas-3.19.0-poppler-24.02.0.patch | 13 + development/gambas3/gambas3.SlackBuild | 2 + .../geany-plugins/geany-plugins.SlackBuild | 2 +- development/geany/geany.SlackBuild | 2 + development/glm/glm.SlackBuild | 1 + development/gnuradio/gnuradio.SlackBuild | 10 +- development/gnuradio/gnuradio.info | 8 +- development/google-go-lang/README | 58 - .../google-go-lang/google-go-lang.SlackBuild | 383 -- .../google-go-lang/google-go-lang.info | 16 - development/google-go-lang/slack-desc | 19 - development/gtest/README | 8 - development/gtest/gtest.SlackBuild | 152 - development/gtest/gtest.info | 10 - development/gtest/slack-desc | 19 - development/gtkdialog/gtkdialog.SlackBuild | 2 +- development/jam/jam.SlackBuild | 10 +- development/jam/jam.info | 8 +- .../jam/patches/01_jam-2.5-overflow.patch | 77 + .../jam/patches/02_jam-missing-includes.patch | 49 + .../jam/patches/03_jam-implicit-int.patch | 26 + .../jam/patches/04_jam-2.5-argv-fixup.patch | 12 + .../jam/patches/05_jam-2.6.1-fix-typo.patch | 12 + .../jupyter-nbclassic.SlackBuild | 8 +- .../jupyter_server/jupyter_server.info | 2 +- development/kicad/kicad.SlackBuild | 3 + development/lua/README | 6 - development/lua/lua.SlackBuild | 127 - development/lua/lua.info | 10 - development/lua/lua.pc | 31 - development/lua/lua.usr.local.patch | 32 - development/lua/slack-desc | 19 - development/luajit/README | 2 - development/luajit/luajit.SlackBuild | 125 - development/luajit/luajit.info | 10 - development/luajit/slack-desc | 19 - development/medit/medit.SlackBuild | 3 +- development/mold/README | 6 - development/mold/mold.SlackBuild | 107 - development/mold/mold.info | 10 - development/mold/slack-desc | 19 - development/mono/mono.SlackBuild | 2 + development/nodejs/README | 8 - development/nodejs/nodejs.SlackBuild | 119 - development/nodejs/nodejs.info | 10 - development/nodejs/npm.sh | 58 - development/nodejs/slack-desc | 19 - .../numpy-legacy/numpy-legacy.SlackBuild | 2 +- development/ocaml/ocaml.SlackBuild | 2 +- development/oneTBB/includes.patch | 10 + development/oneTBB/oneTBB.SlackBuild | 6 + development/oneTBB/unused.patch | 39 + development/opencomal/opencomal.SlackBuild | 2 +- development/pahole/README | 2 - development/pahole/pahole.SlackBuild | 113 - development/pahole/pahole.info | 12 - development/pahole/slack-desc | 19 - development/premake5/premake5.SlackBuild | 4 +- development/premake5/premake5.info | 6 +- development/protobuf3/README | 30 - development/protobuf3/protobuf3.SlackBuild | 123 - development/protobuf3/protobuf3.info | 12 - development/protobuf3/slack-desc | 19 - development/protobuf3/soversion.patch | 36 - development/python3-numpy/README | 41 - development/python3-numpy/README.ATLAS | 10 - .../python3-numpy/python3-numpy.SlackBuild | 158 - development/python3-numpy/python3-numpy.info | 10 - development/python3-numpy/slack-desc | 19 - development/ragel/ragel.SlackBuild | 2 + development/rstudio-desktop/README | 9 +- .../rstudio-desktop.SlackBuild | 2 +- .../rstudio-desktop/rstudio-desktop.info | 6 +- development/rust-opt/README | 21 - development/rust-opt/rust-opt.SlackBuild | 139 - development/rust-opt/rust-opt.info | 12 - development/rust-opt/slack-desc | 19 - development/rust16/README | 22 - development/rust16/rust16.SlackBuild | 142 - development/rust16/rust16.info | 12 - development/rust16/slack-desc | 19 - development/snappy/73.patch | 23 - .../snappy/patches/cmake_add_pkgconfig.patch | 24 + .../snappy/patches/use_system_gtest.patch | 27 + development/snappy/snappy.SlackBuild | 17 +- development/snappy/snappy.info | 6 +- development/snappy/snappy.pc.in | 10 + development/splint/splint.SlackBuild | 5 +- development/systemtap/int.patch | 48 - development/systemtap/systemtap.SlackBuild | 4 +- development/systemtap/systemtap.info | 6 +- development/tora/gcc14.patch | 52 + development/tora/tora.SlackBuild | 3 + development/unifdef/unifdef.SlackBuild | 2 +- .../unittest-cpp/unittest-cpp.SlackBuild | 3 +- development/valgrind/README | 19 - development/valgrind/slack-desc | 19 - development/valgrind/valgrind.SlackBuild | 119 - development/valgrind/valgrind.info | 10 - .../vc-intrinsics/vc-intrinsics.SlackBuild | 2 +- development/vc-intrinsics/vc-intrinsics.info | 6 +- development/zig/zig.SlackBuild | 12 +- development/zig/zig.info | 10 +- games/0ad/0ad.SlackBuild | 1 + games/armagetronad/armagetronad.SlackBuild | 3 + .../armagetronad/patches/libxml2-2.14_1.patch | 304 ++ .../armagetronad/patches/libxml2-2.14_2.patch | 68 + games/astromenace/astromenace.SlackBuild | 2 + games/d1x-rebirth/d1x-rebirth.SlackBuild | 2 +- games/d1x-rebirth/d1x-rebirth.info | 6 +- games/d2x-rebirth/d2x-rebirth.SlackBuild | 2 +- games/d2x-rebirth/d2x-rebirth.info | 6 +- games/doomsday/doomsday.SlackBuild | 10 +- games/frozen-bubble/frozen-bubble.SlackBuild | 1 + games/gnugo/README | 7 - games/gnugo/gnugo.SlackBuild | 108 - games/gnugo/gnugo.info | 10 - games/gnugo/slack-desc | 19 - games/hedgewars/cmake4.patch | 28 + games/hedgewars/hedgewars.SlackBuild | 5 +- games/hedgewars/hedgewars.info | 2 +- games/higan/higan.SlackBuild | 2 + games/higan/includes.diff | 8 + games/innoextract/boost.diff | 10 + games/innoextract/innoextract.SlackBuild | 3 + games/maelstrom/maelstrom.SlackBuild | 2 +- games/micropolis/micropolis.SlackBuild | 2 +- games/openttd/icu.patch | 33 + games/openttd/openttd.SlackBuild | 3 + games/paranoia/gcc-14.diff | 201 + games/paranoia/paranoia.SlackBuild | 3 + games/pioneer/pioneer.SlackBuild | 1 + games/pokerth/patches/boost_1.89.patch | 35 + games/pokerth/patches/boost_1.89_2.patch | 171 + ...erth-1.1.2-boost-1.70-websocket-fix1.patch | 75 - ...erth-1.1.2-boost-1.70-websocket-fix2.patch | 52 - games/pokerth/pokerth.SlackBuild | 13 +- games/pokerth/pokerth.info | 6 +- games/scummvm/scummvm.SlackBuild | 4 - games/smc/boost-1.89.patch | 31 + games/smc/smc.SlackBuild | 2 + games/snes9x/snes9x.SlackBuild | 3 + games/supertux/supertux.SlackBuild | 14 +- games/supertux/supertux.info | 6 +- games/supertuxkart/cmake4.patch | 24 + games/supertuxkart/gcc15-1.patch | 49 + games/supertuxkart/gcc15-2.patch | 21 + games/supertuxkart/supertuxkart.SlackBuild | 5 + games/tome/aur-tome4.patch | 457 +++ games/tome/tome.SlackBuild | 8 +- games/tome/tome.info | 2 +- games/trackballs/cross.patch | 11 + games/trackballs/trackballs.SlackBuild | 3 + games/warzone2100/SQLiteCPP-gcc15.patch | 35 + games/warzone2100/warzone2100.SlackBuild | 5 + gis/grass/gdal-3.3.patch | 84 - gis/grass/grass.SlackBuild | 24 +- gis/grass/grass.info | 8 +- gis/libspatialite/libspatialite.SlackBuild | 2 +- gis/opencpn/README | 8 - gis/opencpn/doinst.sh | 10 - gis/opencpn/opencpn.SlackBuild | 137 - gis/opencpn/opencpn.info | 10 - gis/opencpn/slack-desc | 19 - .../python3-netcdf4-python.SlackBuild | 2 + graphics/Blender/Blender.SlackBuild | 10 +- graphics/Blender/Blender.info | 6 +- graphics/FreeCAD/FreeCAD.SlackBuild | 2 + graphics/OpenCASCADE/OpenCASCADE.SlackBuild | 1 + .../OpenShadingLanguage.SlackBuild | 7 +- .../OpenShadingLanguage.info | 8 +- graphics/OpenShadingLanguage/llvm-20.patch | 37 - graphics/darktable/README | 1 + graphics/darktable/darktable.SlackBuild | 13 +- graphics/darktable/darktable.info | 8 +- graphics/darktable/gcc-15.patch | 93 + graphics/dblatex/dblatex.SlackBuild | 3 + graphics/dblatex/patches/footmisx.patch | 82 + .../patches/replace-imp-by-importlib.patch | 113 + graphics/dia/dia.SlackBuild | 19 +- graphics/dia/patches/dia-0.97.3-c99.patch | 284 ++ .../dia-0.97.3-configure-clang16.patch | 56 + .../dia-0.97.3-freetype_pkgconfig.patch | 66 + .../{ => patches}/dia-enable-html-docs.patch | 0 graphics/djview4/djview4.SlackBuild | 10 +- graphics/djview4/djview4.info | 6 +- .../0001-cross-build-pkg-config-info.patch | 86 + .../djview4/patches/0002-debian-changes.patch | 3606 +++++++++++++++++ .../enblend-enfuse/enblend-enfuse.SlackBuild | 4 +- graphics/enblend-enfuse/enblend-enfuse.info | 6 +- graphics/feh/feh.SlackBuild | 3 + graphics/feh/mkstemp.patch | 16 + graphics/fontforge/fontforge.SlackBuild | 2 + graphics/fontforge/gettext-0.22.patch | 150 + graphics/fritzing/fritzing.SlackBuild | 2 + graphics/fritzing/gcc14.patch | 22 + graphics/gimagereader/gimagereader.SlackBuild | 2 + .../remove_enchant-provider.patch | 68 + graphics/gmic/gmic.SlackBuild | 27 +- graphics/gmic/gmic.info | 8 +- graphics/gpicview/README | 4 + graphics/gpicview/gpicview.SlackBuild | 21 +- graphics/gpicview/gpicview.info | 6 +- graphics/graphviz/README | 11 - graphics/graphviz/doinst.sh | 18 - graphics/graphviz/graphviz.SlackBuild | 135 - graphics/graphviz/graphviz.info | 10 - graphics/graphviz/graphviz.ini | 12 - graphics/graphviz/slack-desc | 19 - graphics/hugin/boost-1.85.0-patch.gz | Bin 388 -> 0 bytes graphics/hugin/hugin.SlackBuild | 14 +- graphics/hugin/hugin.info | 8 +- ...4.5.0-Link-to-the-common-ICU-library.patch | 27 + graphics/imv/imv.SlackBuild | 2 + graphics/inkscape/inkscape.SlackBuild | 15 +- graphics/inkscape/inkscape.info | 8 +- graphics/inkscape/poppler-25.06.patch | 121 + graphics/inkscape/poppler-25.07.patch | 124 + graphics/inkscape/poppler-25.09.patch | 109 + graphics/kColorPicker/README | 5 - graphics/kColorPicker/kColorPicker.SlackBuild | 100 - graphics/kColorPicker/kColorPicker.info | 10 - graphics/kColorPicker/slack-desc | 19 - graphics/kImageAnnotator/README | 3 - .../kImageAnnotator.SlackBuild | 100 - graphics/kImageAnnotator/kImageAnnotator.info | 10 - graphics/kImageAnnotator/slack-desc | 19 - graphics/kuickshow/kuickshow.SlackBuild | 3 + graphics/lensfun03/lensfun03.SlackBuild | 1 + graphics/libplacebo/README | 3 - graphics/libplacebo/libplacebo.SlackBuild | 115 - graphics/libplacebo/libplacebo.info | 10 - graphics/libplacebo/slack-desc | 19 - graphics/libplacebo/use_meson-0.59.4.diff | 11 - .../luminance-hdr/luminance-hdr.SlackBuild | 10 +- graphics/luminance-hdr/luminance-hdr.info | 6 +- ...luminance-hdr-2.5.1-openmp-automagic.patch | 32 + .../patches/luminance-hdr-2.6.0-cmake.patch | 22 + .../patches/luminance-hdr-2.6.0-docs.patch | 15 + .../patches/luminance-hdr-2.6.0-no-git.patch | 15 + .../luminance-hdr-2.6.1.1-exiv-0.28.x.patch | 191 + .../luminance-hdr-2.6.1.1-fixheaders.patch | 15 + .../luminance-hdr-2.6.1.1-openexr3.patch | 28 + graphics/maim/maim.SlackBuild | 7 +- graphics/mypaint/032a155.patch | 98 + graphics/mypaint/3b682d5.patch | 49 + graphics/mypaint/mypaint.SlackBuild | 4 + graphics/nomacs/nomacs.SlackBuild | 1 + .../nvidia-texture-tools.SlackBuild | 1 + graphics/opencollada/opencollada.SlackBuild | 10 +- graphics/opencolorio/opencolorio.SlackBuild | 7 +- graphics/opencolorio/opencolorio.info | 6 +- graphics/openimageio/doinst.sh | 3 + graphics/openimageio/openimageio.SlackBuild | 16 +- graphics/openimageio/openimageio.info | 8 +- graphics/rawtherapee/jpeg_turbo_3.0.3.patch | 89 + graphics/rawtherapee/rawtherapee.SlackBuild | 8 +- graphics/rawtherapee/rawtherapee.info | 6 +- graphics/screengrab/screengrab.SlackBuild | 1 + .../ufraw/patches/ufraw-0.22-exiv2-0.28.patch | 69 + graphics/ufraw/ufraw.SlackBuild | 2 + .../vimiv-qt/build-with-pyproject-toml.patch | 12 + graphics/vimiv-qt/vimiv-qt.SlackBuild | 21 +- graphics/zbar/configure.ac.patch | 14 + graphics/zbar/zbar.SlackBuild | 6 +- graphics/zbar/zbar.info | 6 +- haskell/ghc/ghc.SlackBuild | 6 + haskell/ghc/patches/hp2ps-C-gnu17.patch | 37 + .../ghc/patches/sphinx-4-configuration.patch | 11 + haskell/ghc/patches/sphinx-6.patch | 12 + libraries/2geom/2geom.SlackBuild | 2 +- libraries/2geom/2geom.info | 6 +- libraries/Botan/Botan.SlackBuild | 7 +- libraries/Botan/Botan.info | 6 +- libraries/Botan/botan-2.19.5-boost-1.87.patch | 361 -- libraries/CEGUI/CEGUI.SlackBuild | 100 - libraries/CEGUI/CEGUI.info | 10 - libraries/CEGUI/README | 20 - libraries/CEGUI/slack-desc | 19 - libraries/MyGUI/MyGUI.SlackBuild | 17 +- libraries/MyGUI/cmake4.patch | 12 + libraries/ORBit2/ORBit2.SlackBuild | 2 + .../ORBit2/patches/ORBit2-configure-c99.patch | 147 + libraries/ORBit2/patches/pointer-type.patch | 11 + libraries/OpenBLAS/OpenBLAS.SlackBuild | 104 - libraries/OpenBLAS/OpenBLAS.info | 10 - libraries/OpenBLAS/README | 10 - libraries/OpenBLAS/slack-desc | 19 - .../OpenSceneGraph/OpenSceneGraph.SlackBuild | 4 + libraries/SDL_Pango/SDL_Pango.SlackBuild | 2 +- libraries/allegro/allegro.SlackBuild | 1 + libraries/allegro4/allegro4.SlackBuild | 1 + libraries/alure/alure.SlackBuild | 1 + libraries/antlr4/antlr4.SlackBuild | 1 + libraries/appstream-glib/README | 1 - .../appstream-glib/appstream-glib.SlackBuild | 114 - libraries/appstream-glib/appstream-glib.info | 10 - libraries/appstream-glib/slack-desc | 19 - libraries/argtable/argtable.SlackBuild | 2 + ...13-Fix-implicit-function-declaration.patch | 16 + ...2.13-Fix-undeclared-library-function.patch | 28 + libraries/assimp/assimp.SlackBuild | 7 +- libraries/assimp/gcc-15.patch | 243 ++ libraries/aubio/README | 8 +- libraries/aubio/aubio.SlackBuild | 15 +- libraries/aubio/aubio.info | 8 +- libraries/aubio/ffmpeg7.patch | 15 + .../bamf/add_compile_warning_flags.patch | 71 - libraries/bamf/bamf-no-gtester2xunit.patch | 22 + libraries/bamf/bamf.SlackBuild | 6 +- libraries/bamf/bamf.info | 6 +- libraries/bitsery/bitsery.SlackBuild | 1 + libraries/bullet/bullet.SlackBuild | 1 + libraries/c-blosc/c-blosc.SlackBuild | 1 + libraries/chromaprint/chromaprint.SlackBuild | 5 + libraries/chromaprint/patches/aa67c95b.patch | 50 + libraries/chromaprint/patches/ffmpeg5.patch | 550 +++ libraries/chromaprint/patches/ffmpeg7.patch | 20 + libraries/cmark/README | 10 - libraries/cmark/cmark.SlackBuild | 114 - libraries/cmark/cmark.info | 10 - libraries/cmark/slack-desc | 19 - libraries/coeurl/coeurl.SlackBuild | 1 + libraries/coeurl/curlwrap.patch | 9 + libraries/cogl/cogl.SlackBuild | 2 +- libraries/collada-dom/boost-1.85.patch | 50 + libraries/collada-dom/collada-dom.SlackBuild | 3 + .../compiz-plugins-experimental.SlackBuild | 2 + .../compiz-plugins-experimental/gcc13.patch | 169 + .../compiz-plugins-extra.SlackBuild | 2 + libraries/compiz-plugins-extra/gcc13.patch | 203 + ...ompiz-plugins-main-0.8.18-gcc-14-fix.patch | 96 + .../compiz-plugins-main.SlackBuild | 3 + libraries/dav1d/README | 7 - libraries/dav1d/dav1d.SlackBuild | 104 - libraries/dav1d/dav1d.info | 10 - libraries/dav1d/slack-desc | 19 - .../double-conversion.SlackBuild | 1 + libraries/efl/efl.SlackBuild | 18 +- libraries/efl/efl.info | 8 +- libraries/fcft/fcft.SlackBuild | 6 +- libraries/fcft/fcft.info | 6 +- libraries/fcl/fcl.SlackBuild | 5 +- ...87de3f896d0c4ff01b21f572375e11f9c3f1.patch | 27 - libraries/ffms2/ffms2.SlackBuild | 5 +- libraries/ffms2/ffms2.info | 6 +- libraries/flickcurl/flickcurl.SlackBuild | 3 +- libraries/flickcurl/includes.patch | 275 ++ libraries/fmt/README | 2 - libraries/fmt/fmt.SlackBuild | 105 - libraries/fmt/fmt.info | 10 - libraries/fmt/slack-desc | 19 - libraries/ftgl/ftgl.SlackBuild | 2 +- libraries/gdl/gdl.SlackBuild | 9 +- libraries/gdl/gdl.info | 6 +- libraries/gevent/gevent.SlackBuild | 3 + libraries/gevent/workaround-cython-bug.patch | 9 + libraries/gflags/gflags.SlackBuild | 1 + libraries/gl2ps/gl2ps.SlackBuild | 1 + libraries/gspell/README | 4 - libraries/gspell/gspell.SlackBuild | 115 - libraries/gspell/gspell.info | 10 - libraries/gspell/slack-desc | 19 - libraries/gtk-layer-shell/README | 21 - .../gtk-layer-shell.SlackBuild | 122 - .../gtk-layer-shell/gtk-layer-shell.info | 10 - libraries/gtk-layer-shell/slack-desc | 19 - .../gtksourceview/gtksourceview.SlackBuild | 2 +- .../{gtksourceview4 => gtksourceview3}/README | 0 ...929f02730e3a2d0e4f8fd69f2831b8ade4d0.patch | 42 + .../gtksourceview3/gtksourceview3.SlackBuild | 110 + libraries/gtksourceview3/gtksourceview3.info | 10 + libraries/gtksourceview3/slack-desc | 19 + .../gtksourceview4/gtksourceview4.SlackBuild | 113 - libraries/gtksourceview4/gtksourceview4.info | 10 - libraries/gtksourceview4/slack-desc | 19 - libraries/hidapi/hidapi.SlackBuild | 1 + libraries/html5lib/README | 5 - libraries/html5lib/html5lib.SlackBuild | 83 - libraries/html5lib/html5lib.info | 10 - libraries/html5lib/slack-desc | 19 - libraries/iniparser/README | 6 - libraries/iniparser/iniparser.SlackBuild | 115 - libraries/iniparser/iniparser.info | 10 - libraries/iniparser/slack-desc | 19 - libraries/keybinder/keybinder.SlackBuild | 1 + libraries/kirigami-addons/README | 9 - .../kirigami-addons.SlackBuild | 106 - .../kirigami-addons/kirigami-addons.info | 10 - libraries/kirigami-addons/slack-desc | 19 - libraries/lgi/README | 3 - libraries/lgi/lgi.SlackBuild | 102 - libraries/lgi/lgi.info | 10 - libraries/lgi/slack-desc | 19 - libraries/libadwaita/README | 20 - .../libadwaita-1.0.5-support-gtk-4.4.patch | 12 - ...a-1.0.5-suppress-line-break-warnings.patch | 12 - ...ita-1.2.0-dont-use-titlebar-property.patch | 15 - libraries/libadwaita/libadwaita.SlackBuild | 13 +- libraries/libadwaita/libadwaita.info | 8 +- libraries/libass/README | 5 - libraries/libass/libass.SlackBuild | 108 - libraries/libass/libass.info | 10 - libraries/libass/slack-desc | 19 - .../libbonobo/libbonobo-2.32.1-c23.patch | 37 + libraries/libbonobo/libbonobo.SlackBuild | 3 + libraries/libcbor/libcbor.SlackBuild | 1 + libraries/libccd/libccd.SlackBuild | 1 + libraries/libcryptui/libcryptui.SlackBuild | 3 + libraries/libcuefile/libcuefile.SlackBuild | 3 +- libraries/libdart/libdart.SlackBuild | 1 + libraries/libdispatch/libdispatch.SlackBuild | 2 +- libraries/libdispatch/libdispatch.info | 6 +- libraries/libdisplay-info/README | 7 - .../libdisplay-info.SlackBuild | 117 - .../libdisplay-info/libdisplay-info.info | 10 - libraries/libdisplay-info/slack-desc | 19 - libraries/libev/README | 12 - libraries/libev/libev.SlackBuild | 120 - libraries/libev/libev.info | 10 - libraries/libev/slack-desc | 19 - libraries/libffado/libffado.SlackBuild | 23 +- libraries/libffado/libffado.info | 6 +- libraries/libgdiplus/libgdiplus.SlackBuild | 2 + libraries/libglpng/libglpng.SlackBuild | 2 +- libraries/libgme/libgme.SlackBuild | 1 + libraries/libgusb/README | 6 - libraries/libgusb/libgusb.SlackBuild | 110 - libraries/libgusb/libgusb.info | 10 - libraries/libgusb/slack-desc | 19 - libraries/libhandy/README | 4 - libraries/libhandy/libhandy.SlackBuild | 90 - libraries/libhandy/libhandy.info | 10 - libraries/libhandy/slack-desc | 19 - libraries/libindi/README | 16 - libraries/libindi/doinst.sh | 3 - libraries/libindi/libindi.SlackBuild | 113 - libraries/libindi/libindi.info | 10 - libraries/libindi/slack-desc | 19 - libraries/libiptcdata/libiptcdata.SlackBuild | 4 +- libraries/libiptcdata/libiptcdata.info | 6 +- libraries/libkml/libkml.SlackBuild | 1 + libraries/liblangtag/liblangtag.SlackBuild | 2 +- libraries/liblangtag/liblangtag.info | 6 +- libraries/liblxqt/liblxqt.SlackBuild | 1 + libraries/libmpd/libmpd.SlackBuild | 2 +- libraries/libmspub/gcc15.patch | 10 + libraries/libmspub/libmspub.SlackBuild | 2 + libraries/libnfs/libnfs.SlackBuild | 2 +- libraries/libnfs/libnfs.info | 6 +- libraries/libnova/README | 7 - libraries/libnova/libnova.SlackBuild | 122 - libraries/libnova/libnova.info | 10 - libraries/libnova/slack-desc | 19 - libraries/liboauth/liboauth.SlackBuild | 2 +- libraries/libosinfo/libosinfo.SlackBuild | 2 + libraries/libosinfo/libxml2-2.14.patch | 83 + libraries/libpano13/libpano13.SlackBuild | 3 +- libraries/libportal/libportal.SlackBuild | 2 + libraries/libportal/qt-6.9.patch | 41 + libraries/libpst/libpst.SlackBuild | 75 +- .../0002-incompatible-pointer-i686.patch | 12 + .../libpst/patches/0003-gcc-c23-changes.patch | 20 + libraries/libpst/patches/m4-python310.patch | 28 + .../libquicktime/libquicktime-ffmpeg3.patch | 935 ----- .../libquicktime/libquicktime.SlackBuild | 21 +- .../libquicktime-1.2.4-CVE-2016-2399.patch | 25 + ...bquicktime-1.2.4-CVE-2017-9122_et_al.patch | 151 + .../libquicktime-1.2.4-faad2.patch | 0 .../libquicktime-1.2.4-ffmpeg-codecs.patch | 651 +++ .../libquicktime-1.2.4-ffmpeg2.patch | 0 .../patches/libquicktime-1.2.4-ffmpeg29.patch | 287 ++ .../libquicktime-1.2.4-ffmpeg4.patch | 0 .../patches/libquicktime-1.2.4-ffmpeg5.patch | 342 ++ .../patches/libquicktime-1.2.4-ffmpeg7.patch | 38 + .../libquicktime-1.2.4-libavutil.patch | 12 + .../patches/libquicktime-1.2.4-qtpng.patch | 11 + .../libreplaygain/libreplaygain.SlackBuild | 1 + libraries/libsbsms/libsbsms.SlackBuild | 1 + libraries/libsmi/gcc-14.patch | 45 + libraries/libsmi/gcc-15.patch | 36 + libraries/libsmi/libsmi.SlackBuild | 10 +- libraries/libsmi/libsmi.info | 6 +- libraries/libsoup3/README | 6 - libraries/libsoup3/libsoup3.SlackBuild | 108 - libraries/libsoup3/libsoup3.info | 10 - libraries/libsoup3/slack-desc | 19 - libraries/libtraceevent/README | 3 - .../libtraceevent/libtraceevent.SlackBuild | 96 - libraries/libtraceevent/libtraceevent.info | 10 - libraries/libtraceevent/slack-desc | 19 - libraries/libtracefs/README | 2 - libraries/libtracefs/libtracefs.SlackBuild | 96 - libraries/libtracefs/libtracefs.info | 10 - libraries/libtracefs/slack-desc | 19 - libraries/libunibreak/README | 9 - libraries/libunibreak/libunibreak.SlackBuild | 91 - libraries/libunibreak/libunibreak.info | 10 - libraries/libunibreak/slack-desc | 19 - libraries/libunicap/libunicap.SlackBuild | 2 + .../libvdpau-va-gl/libvdpau-va-gl.SlackBuild | 7 +- libraries/libvdpau-va-gl/libvdpau-va-gl.info | 6 +- .../libvirt-python/libvirt-python.SlackBuild | 4 +- libraries/libvirt-python/libvirt-python.info | 6 +- libraries/libvirt/libvirt.SlackBuild | 2 +- libraries/libvirt/libvirt.info | 6 +- libraries/libwpe/libwpe.SlackBuild | 1 + libraries/libzim/icu76.patch | 21 + libraries/libzim/libzim.SlackBuild | 2 + .../lxqt-build-tools.SlackBuild | 1 + libraries/mbedtls/mbedtls.SlackBuild | 1 + .../mlt-bindings/mlt-bindings.SlackBuild | 2 +- libraries/mlt-bindings/mlt-bindings.info | 6 +- libraries/mtxclient/mtxclient.SlackBuild | 2 +- libraries/mtxclient/mtxclient.info | 6 +- libraries/mujs/README | 13 - libraries/mujs/mujs.SlackBuild | 102 - libraries/mujs/mujs.info | 10 - .../mujs/set-library-soname-version.diff | 48 - libraries/mujs/slack-desc | 19 - libraries/nghttp3/README | 42 - libraries/nghttp3/nghttp3.SlackBuild | 105 - libraries/nghttp3/nghttp3.info | 10 - libraries/nghttp3/slack-desc | 19 - libraries/ngtcp2/ngtcp2.SlackBuild | 4 +- libraries/ngtcp2/ngtcp2.info | 6 +- .../nlohmann_json/nlohmann_json.SlackBuild | 3 + ...5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch | 55 + ...0b58565073975d6f5d94365d6cbf150a4cf8.patch | 24 + libraries/nv-codec-headers/README | 18 - .../nv-codec-headers.SlackBuild | 88 - .../nv-codec-headers/nv-codec-headers.info | 10 - libraries/nv-codec-headers/slack-desc | 19 - libraries/nx-libs/nx-libs.SlackBuild | 17 +- libraries/nx-libs/nx-libs.info | 6 +- libraries/ogre/README | 3 +- ...f06bb0d49ce847efe3a80ebe01c9762ea0b1.patch | 25 - libraries/ogre/ogre.SlackBuild | 12 +- libraries/ogre/ogre.info | 10 +- libraries/ois/ois.SlackBuild | 19 +- libraries/ois/ois.info | 6 +- libraries/olm/olm.SlackBuild | 1 + .../010-openvino-disable-werror.patch | 13 + ...20-openvino-use-protobuf-shared-libs.patch | 11 + libraries/openvino/openvino.SlackBuild | 3 + libraries/physfs/physfs.SlackBuild | 1 + libraries/plog/plog.SlackBuild | 1 + libraries/poco/poco.SlackBuild | 2 +- libraries/poco/poco.info | 6 +- libraries/ptex/ptex.SlackBuild | 1 - .../python3-PyQtWebEngine.SlackBuild | 17 +- .../python3-PyQtWebEngine.info | 6 +- .../python3-ruamel.yaml.clib.SlackBuild | 2 +- libraries/pytorch/pytorch.SlackBuild | 2 +- ...verywhere-opensource-src-4.8.7-icu59.patch | 31 +- libraries/qt4/qt4.SlackBuild | 56 +- libraries/qt6/README | 39 - libraries/qt6/README.SLACKWARE | 35 - libraries/qt6/desktop/assistant-qt6.desktop | 8 - libraries/qt6/desktop/designer-qt6.desktop | 10 - libraries/qt6/desktop/linguist-qt6.desktop | 9 - libraries/qt6/desktop/qdbusviewer-qt6.desktop | 9 - libraries/qt6/doinst.sh | 9 - libraries/qt6/newer_protobuf_1.patch | 58 - libraries/qt6/newer_protobuf_2.patch | 42 - libraries/qt6/profile.d/qt6.csh | 17 - libraries/qt6/profile.d/qt6.sh | 17 - libraries/qt6/qt6.SlackBuild | 197 - libraries/qt6/qt6.info | 12 - libraries/qt6/slack-desc | 19 - libraries/qtermwidget/qtermwidget.SlackBuild | 1 + libraries/quesoglc/quesoglc.SlackBuild | 2 +- libraries/range-v3/range-v3.SlackBuild | 4 + libraries/rapidjson/rapidjson.SlackBuild | 1 + libraries/rrdtool/rrdtool.SlackBuild | 4 +- libraries/rrdtool/rrdtool.info | 6 +- libraries/seatd/README | 16 - libraries/seatd/seatd.SlackBuild | 123 - libraries/seatd/seatd.info | 10 - libraries/seatd/slack-desc | 19 - libraries/spdlog/README | 4 +- libraries/spdlog/spdlog.SlackBuild | 19 +- libraries/spdlog/spdlog.info | 8 +- libraries/srt/srt.SlackBuild | 3 +- libraries/stfl/stfl.SlackBuild | 1 + libraries/tbb/tbb.SlackBuild | 1 + libraries/tkimg/tkimg.SlackBuild | 15 +- libraries/tkimg/tkimg.info | 6 +- libraries/tree-sitter/README | 4 - libraries/tree-sitter/slack-desc | 19 - libraries/tree-sitter/tree-sitter.SlackBuild | 100 - libraries/tree-sitter/tree-sitter.info | 10 - libraries/tsocks/tsocks.SlackBuild | 2 +- libraries/unarr/unarr.SlackBuild | 2 +- libraries/vigra/README | 2 +- libraries/vigra/vigra.SlackBuild | 13 +- libraries/vigra/vigra.info | 6 +- libraries/volk/volk.SlackBuild | 1 + libraries/wcslib/README | 11 - libraries/wcslib/slack-desc | 19 - libraries/wcslib/wcslib.SlackBuild | 124 - libraries/wcslib/wcslib.info | 10 - libraries/wlroots/README | 19 - libraries/wlroots/slack-desc | 19 - libraries/wlroots/wlroots.SlackBuild | 119 - libraries/wlroots/wlroots.info | 10 - .../wpebackend-fdo/wpebackend-fdo.SlackBuild | 7 +- libraries/wpebackend-fdo/wpebackend-fdo.info | 6 +- libraries/wxWidgets/wxWidgets.SlackBuild | 2 + libraries/wxsvg/gcc13.patch | 31 - libraries/wxsvg/wxsvg.SlackBuild | 15 +- libraries/wxsvg/wxsvg.info | 6 +- libraries/xbyak/xbyak.SlackBuild | 1 + libraries/yajl/patches/0009-cmake4.patch | 66 + libraries/yaml-cpp/yaml-cpp.SlackBuild | 15 +- libraries/yaml-cpp/yaml-cpp.info | 6 +- libraries/zstd-cmake/README | 2 - libraries/zstd-cmake/slack-desc | 19 - libraries/zstd-cmake/zstd-cmake.SlackBuild | 109 - libraries/zstd-cmake/zstd-cmake.info | 10 - libraries/zxing-cpp/README | 20 - libraries/zxing-cpp/slack-desc | 19 - libraries/zxing-cpp/zxing-cpp.SlackBuild | 117 - libraries/zxing-cpp/zxing-cpp.info | 10 - libraries/zxing-cpp/zxing.cmake.patch | 15 - misc/cwiid/cwiid.SlackBuild | 19 +- misc/cwiid/cwiid.info | 6 +- misc/cwiid/python310.patch | 11 - misc/cwiid/wmgui.desktop | 11 + misc/cwiid/wmgui.xpm | 552 +++ misc/fcitx5-chinese-addons/README | 7 - misc/fcitx5-chinese-addons/doinst.sh | 12 - .../fcitx5-chinese-addons.SlackBuild | 106 - .../fcitx5-chinese-addons.info | 10 - misc/fcitx5-chinese-addons/slack-desc | 19 - misc/fcitx5-configtool/README | 10 - misc/fcitx5-configtool/doinst.sh | 3 - .../fcitx5-configtool.SlackBuild | 110 - misc/fcitx5-configtool/fcitx5-configtool.info | 10 - misc/fcitx5-configtool/slack-desc | 19 - misc/fcitx5-gtk/README | 15 - misc/fcitx5-gtk/fcitx5-gtk.SlackBuild | 103 - misc/fcitx5-gtk/fcitx5-gtk.info | 10 - misc/fcitx5-gtk/slack-desc | 19 - misc/fcitx5-mozc/0013-mozc-includes.patch | 20 + misc/fcitx5-mozc/fcitx5-mozc.SlackBuild | 5 +- misc/fcitx5-mozc/fcitx5-mozc.info | 4 +- misc/fcitx5-qt/README | 23 - misc/fcitx5-qt/doinst.sh | 3 - misc/fcitx5-qt/fcitx5-qt.SlackBuild | 107 - misc/fcitx5-qt/fcitx5-qt.info | 10 - misc/fcitx5-qt/slack-desc | 19 - misc/fcitx5-table-extra/README | 13 - misc/fcitx5-table-extra/doinst.sh | 12 - .../fcitx5-table-extra.SlackBuild | 82 - .../fcitx5-table-extra.info | 10 - misc/fcitx5-table-extra/slack-desc | 19 - misc/fcitx5-table-other/README | 7 - misc/fcitx5-table-other/doinst.sh | 12 - .../fcitx5-table-other.SlackBuild | 98 - .../fcitx5-table-other.info | 10 - misc/fcitx5-table-other/slack-desc | 19 - misc/fcitx5/README | 37 - misc/fcitx5/doinst.sh | 13 - misc/fcitx5/fcitx5-autostart | 36 - misc/fcitx5/fcitx5.SlackBuild | 110 - misc/fcitx5/fcitx5.info | 10 - misc/fcitx5/slack-desc | 19 - misc/moreutils/README | 13 - misc/moreutils/moreutils.SlackBuild | 104 - misc/moreutils/moreutils.info | 10 - misc/moreutils/slack-desc | 19 - misc/projectM/projectM.SlackBuild | 36 +- misc/projectM/projectM.info | 8 +- misc/qtspell/qtspell.SlackBuild | 1 + misc/sdcv/gcc_14-modern_glib2.patch | 40 + misc/sdcv/sdcv.SlackBuild | 17 +- misc/sdcv/sdcv.info | 6 +- misc/seahorse-plugins/README | 2 - misc/seahorse-plugins/doinst.sh | 24 - .../seahorse-plugins.SlackBuild | 97 - misc/seahorse-plugins/seahorse-plugins.info | 10 - misc/seahorse-plugins/slack-desc | 19 - misc/wkhtmltopdf/README | 4 - misc/wkhtmltopdf/slack-desc | 19 - misc/wkhtmltopdf/wkhtmltopdf.SlackBuild | 108 - misc/wkhtmltopdf/wkhtmltopdf.info | 10 - misc/xcb-imdkit/README | 8 - misc/xcb-imdkit/slack-desc | 19 - misc/xcb-imdkit/xcb-imdkit.SlackBuild | 103 - misc/xcb-imdkit/xcb-imdkit.info | 10 - multimedia/HandBrake/A08-cmake4.patch | 32 + multimedia/HandBrake/HandBrake.SlackBuild | 5 + multimedia/MuseScore/MuseScore.SlackBuild | 1 + multimedia/aom/README | 7 - multimedia/aom/aom.SlackBuild | 126 - multimedia/aom/aom.info | 10 - multimedia/aom/slack-desc | 19 - multimedia/avidemux/README | 4 +- multimedia/avidemux/avidemux.SlackBuild | 17 +- multimedia/avidemux/avidemux.info | 6 +- .../avidemux/extra-patch-i386-nosse.patch.gz | Bin 362 -> 391 bytes multimedia/avidemux/x265-4.1.diff | 19 - multimedia/ccextractor/ccextractor.SlackBuild | 4 +- multimedia/cinelerra/cinelerra.SlackBuild | 4 +- multimedia/cinelerra/cinelerra.info | 6 +- multimedia/dvdstyler/dvdstyler.SlackBuild | 2 + multimedia/dvdstyler/ffmpeg-7.patch | 147 + .../gmidimonitor/gmidimonitor.SlackBuild | 2 + multimedia/gpac/ffmpeg7.patch | 86 + multimedia/gpac/gpac.SlackBuild | 3 + .../gst-plugins-bad-nonfree.SlackBuild | 32 +- .../gst-plugins-bad-nonfree.info | 6 +- .../gst-plugins-bad-nonfree/new_x265.diff | 15 - .../gst-plugins-bad-nonfree/new_zxing.diff | 303 -- .../gst-plugins-ugly.SlackBuild | 10 +- .../gst-plugins-ugly/gst-plugins-ugly.info | 6 +- multimedia/haruna/haruna.SlackBuild | 2 + multimedia/haruna/mpv-0.38.patch | 36 + .../intel-gmmlib/intel-gmmlib.SlackBuild | 3 +- multimedia/intel-gmmlib/intel-gmmlib.info | 6 +- .../intel-media-driver.SlackBuild | 6 +- .../intel-media-driver.info | 6 +- .../intel-media-sdk.SlackBuild | 7 +- .../intel-media-sdk/intel-media-sdk.info | 6 +- ...-media-sdk-libcttmetrics-static-only.patch | 12 + .../030-intel-media-sdk-gcc13-fix.patch | 10 + .../040-intel-media-sdk-gcc15-fix.patch | 17 + multimedia/kodi/README | 11 +- multimedia/kodi/kodi.SlackBuild | 14 +- multimedia/kodi/kodi.info | 4 +- multimedia/kodi/pipewire-1.4.0.patch | 28 + multimedia/losslesscut-bin/README | 12 + multimedia/losslesscut-bin/doinst.sh | 8 + .../losslesscut-bin.SlackBuild | 77 + .../losslesscut-bin/losslesscut-bin.info | 10 + multimedia/losslesscut-bin/resources/LICENSE | 21 + multimedia/losslesscut-bin/resources/icon.svg | 59 + .../resources/losslesscut-bin.desktop | 12 + multimedia/losslesscut-bin/slack-desc | 19 + multimedia/mjpegtools/mjpegtools.SlackBuild | 2 +- multimedia/mkvtoolnix/boost_1.89.patch | 109 + multimedia/mkvtoolnix/mkvtoolnix.SlackBuild | 5 +- multimedia/mkvtoolnix/mkvtoolnix.info | 6 +- multimedia/mpv/README | 35 - multimedia/mpv/doinst.sh | 37 - multimedia/mpv/mpv.SlackBuild | 147 - multimedia/mpv/mpv.info | 10 - multimedia/mpv/slack-desc | 19 - multimedia/obs-studio/obs-studio.SlackBuild | 5 + multimedia/obs-studio/patches/1_7ed9b1f.patch | 43 + multimedia/obs-studio/patches/2_92fc9f6.patch | 43 + multimedia/obs-studio/patches/3_ed1e079.patch | 39 + multimedia/obs-studio/patches/4_6d0381f.patch | 157 + .../obs-studio/patches/5_ffmpeg-7.patch | 64 + multimedia/openshot/openshot.info | 2 +- multimedia/shotcut/shotcut.SlackBuild | 30 +- multimedia/shotcut/shotcut.info | 8 +- multimedia/spek/spek.SlackBuild | 17 +- multimedia/spek/spek.info | 6 +- .../transcode-1.1.7-ffmpeg-0.10.patch | 15 - .../transcode-1.1.7-ffmpeg-0.11.patch | 303 -- .../transcode/transcode-1.1.7-ffmpeg.patch | 51 - .../transcode/transcode-1.1.7-ffmpeg2.patch | 557 --- .../transcode/transcode-1.1.7-ffmpeg24.patch | 18 - .../transcode/transcode-1.1.7-ffmpeg29.patch | 352 -- .../transcode/transcode-1.1.7-ffmpeg4.patch | 508 --- .../transcode/transcode-1.1.7-libav-10.patch | 36 - .../transcode/transcode-1.1.7-libav-9.patch | 31 - .../transcode-1.1.7-preset-force.patch | 28 - .../transcode-1.1.7-preset-free.patch | 34 - multimedia/transcode/transcode.SlackBuild | 21 +- multimedia/tvheadend/tvheadend.SlackBuild | 1 + multimedia/vcdimager/libxml214.diff | 37 + multimedia/vcdimager/vcdimager.SlackBuild | 2 + multimedia/vlc/4645.patch | 177 + multimedia/vlc/4665.patch | 375 ++ .../vlc/vlc-3.0.21-fedora_ffmpeg7-1.patch | 1139 ++++++ multimedia/vlc/vlc.SlackBuild | 6 + multimedia/x265/cmake4.patch | 32 + multimedia/x265/x265.SlackBuild | 6 + multimedia/xvidcore/xvidcore-c23.patch | 13 + multimedia/xvidcore/xvidcore.SlackBuild | 2 + network/ClusterSSH/ClusterSSH.SlackBuild | 17 +- network/ClusterSSH/ClusterSSH.info | 6 +- network/MEGAcmd/MEGAcmd.SlackBuild | 6 +- network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch | 11 - network/MEGAcmd/megacmd-1.7.0_ffmpeg6.patch | 27 + network/MEGAsync/MEGAsync.SlackBuild | 6 +- network/MEGAsync/MEGAsync.info | 10 +- .../MEGAsync/megasync-4.5.0.0_ffmpeg.patch | 24 - .../MEGAsync/megasync-4.9.1.0_ffmpeg6.patch | 40 + network/aMule/aMule.SlackBuild | 6 +- network/aMule/aMule.info | 8 +- network/avahi/README | 14 - network/avahi/README.SBo | 43 - network/avahi/avahi.SlackBuild | 180 - network/avahi/avahi.info | 10 - network/avahi/doinst.sh | 38 - network/avahi/man/man1/avahi-bookmarks.1 | 33 - network/avahi/man/man1/avahi-browse.1 | 66 - network/avahi/man/man1/avahi-discover.1 | 16 - network/avahi/man/man1/avahi-publish.1 | 52 - network/avahi/man/man1/avahi-resolve.1 | 49 - network/avahi/man/man1/avahi-set-host-name.1 | 24 - network/avahi/man/man1/bssh.1 | 36 - network/avahi/man/man5/avahi-daemon.conf.5 | 102 - network/avahi/man/man5/avahi.hosts.5 | 16 - network/avahi/man/man5/avahi.service.5 | 41 - network/avahi/man/man8/avahi-daemon.8 | 76 - network/avahi/man/man8/avahi-dnsconfd.8 | 48 - .../avahi/man/man8/avahi-dnsconfd.action.8 | 30 - .../patches/fixup_avahi-dnsconfd.action.patch | 69 - network/avahi/slack-desc | 19 - network/bitchx/bitchx.SlackBuild | 2 +- network/broadcom-wl/broadcom-wl.SlackBuild | 3 + network/claws-mail/claws-mail.SlackBuild | 4 +- network/claws-mail/claws-mail.info | 6 +- network/curl-quic/curl-quic.SlackBuild | 2 +- network/curl-quic/curl-quic.info | 6 +- network/dsniff/dsniff.SlackBuild | 2 +- network/ettercap/ettercap.SlackBuild | 1 + network/fail2ban/fail2ban.SlackBuild | 9 +- network/glusterfs/glusterfs.SlackBuild | 32 +- network/glusterfs/glusterfs.info | 6 +- network/insync/insync.SlackBuild | 2 +- network/insync/insync.info | 6 +- network/lurch/lurch.SlackBuild | 1 + network/mdk4/mdk4.SlackBuild | 2 + network/mdk4/patches/01_manpage_example.patch | 22 + ...02_makefile_osdep_parallel_build_fix.patch | 23 + network/mdk4/patches/03_fix-x-mode-bug.patch | 70 + ...04_Declare-functions-before-using-it.patch | 109 + .../mdk4/patches/05_ftbfs-with-gcc-14.patch | 34 + network/memcached/memcached.SlackBuild | 2 +- network/mosh/1282.patch | 43 - network/mosh/README | 18 - network/mosh/mosh.SlackBuild | 107 - network/mosh/mosh.info | 10 - network/mosh/slack-desc | 19 - .../mumble-server/mumble-server.SlackBuild | 11 +- network/mumble-server/mumble-server.info | 6 +- network/mumble/mumble.SlackBuild | 7 +- network/mumble/mumble.info | 6 +- network/ngrep/ngrep-1.47-regex.patch | 29 + network/ngrep/ngrep.SlackBuild | 3 + network/offlineimap/offlineimap.info | 2 +- network/remmina/remmina.SlackBuild | 4 +- network/remmina/remmina.info | 6 +- network/sqlmap/sqlmap.SlackBuild | 2 +- network/sqlmap/sqlmap.info | 6 +- network/ssmtp/ssmtp.SlackBuild | 2 + network/sylpheed/sylpheed-3.7.0-types.patch | 201 + network/sylpheed/sylpheed.SlackBuild | 7 +- network/tokodon/README | 8 - network/tokodon/doinst.sh | 9 - network/tokodon/slack-desc | 19 - network/tokodon/tokodon.SlackBuild | 111 - network/tokodon/tokodon.info | 10 - network/transmission/transmission.SlackBuild | 4 + ...against-libncursesw-setlocale-LC_ALL.patch | 49 + ...invoke-AM_INIT_AUTOMAKE-with-foreign.patch | 21 + network/urlview/urlview.SlackBuild | 13 +- network/vde2/rc.vde2 | 2 +- network/vde2/vde2.SlackBuild | 21 +- network/vde2/vde2.info | 6 +- ...yptcab-compile-against-openssl-1.1.0.patch | 92 - network/w3m/w3m.SlackBuild | 4 +- ...-0.7.1-Fix-config.h-test-consumption.patch | 35 + .../wol-0.7.1-Fix-malloc-detection.patch | 39 + .../wol/patches/wol-0.7.1-linux-headers.patch | 11 + network/wol/wol.SlackBuild | 22 +- network/wsdd2/README | 34 - network/wsdd2/README.allowip6 | 17 - network/wsdd2/doinst.sh | 26 - network/wsdd2/rc.wsdd2 | 58 - network/wsdd2/slack-desc | 19 - network/wsdd2/wsdd2.SlackBuild | 112 - network/wsdd2/wsdd2.info | 10 - network/wsdd2/wsdd2.patch | 11 - network/x2goclient/x2goclient.SlackBuild | 13 +- network/x2goclient/x2goclient.info | 6 +- network/x2goserver/x2goserver.SlackBuild | 4 +- network/x2goserver/x2goserver.info | 6 +- office/abiword/abiword.SlackBuild | 6 +- office/asymptote/asymptote.SlackBuild | 2 +- .../evince-46.3.1-kpathsea-header-files.patch | 10 + office/evince/evince.SlackBuild | 7 +- office/evince/evince.info | 6 +- office/gnucash/gnucash.SlackBuild | 3 - office/gnucash/gnucash.info | 2 +- office/goldendict/ffmpeg7.patch | 104 + office/goldendict/goldendict.SlackBuild | 2 + office/kbibtex/kbibtex.SlackBuild | 3 + office/neoleo/neoleo.SlackBuild | 2 +- office/neoleo/neoleo.info | 6 +- office/paps/fmt-12.patch | 29 + office/paps/glib-2.82.patch | 45 + office/paps/paps.SlackBuild | 3 + office/qpdfview/qpdfview.SlackBuild | 2 + .../scribus/scribus-1.6.4_poppler-25.06.patch | 17 + .../scribus/scribus-1.6.4_poppler-25.07.patch | 38 + .../scribus/scribus-1.6.4_poppler-25.09.patch | 147 + office/scribus/scribus.SlackBuild | 4 + office/task/task.SlackBuild | 1 + office/texlive-extra/texlive-extra.SlackBuild | 11 +- office/texlive-extra/texlive-extra.info | 6 +- office/xournal/xournal-0.4.8-c99-fix.patch | 89 + office/xournal/xournal.SlackBuild | 2 + perl/mod_perl/mod_perl.SlackBuild | 3 + perl/mod_perl/r1910623.patch | 23 + .../perl-Getopt-Long-Descriptive.SlackBuild | 2 +- .../perl-Getopt-Long-Descriptive.info | 6 +- perl/perl-IO-Tty/README | 10 - perl/perl-IO-Tty/perl-IO-Tty.SlackBuild | 79 - perl/perl-IO-Tty/perl-IO-Tty.info | 10 - perl/perl-IO-Tty/slack-desc | 19 - perl/perl-SDL/perl-SDL.SlackBuild | 2 + perl/perl-Test-Trap/perl-Test-Trap.SlackBuild | 2 +- perl/perl-Test-Trap/perl-Test-Trap.info | 6 +- .../perl-Unicode-Map8-0.12-declaration.patch | 11 + .../patches/perl-Unicode-Map8-0.12-type.patch | 11 + .../perl-Unicode-Map8-0.13-recode.patch | 22 + .../perl-Unicode-Map8.SlackBuild | 2 + perl/perl-tk/patches/01_perl-Tk-widget.patch | 26 + perl/perl-tk/patches/02_perl-Tk-debian.patch | 71 + perl/perl-tk/patches/03_perl-Tk-seg.patch | 33 + perl/perl-tk/patches/04_perl-Tk-c99.patch | 81 + ...t-pointer-confusion-in-Tcl_GetByteAr.patch | 45 + .../06_perl-Tk-Fix-build-with-clang-16.patch | 746 ++++ ...void-using-incompatible-pointer-type.patch | 24 + ...compatible-pointer-type-for-old_warn.patch | 30 + ...ointer-type-in-function-GetTextIndex.patch | 746 ++++ perl/perl-tk/perl-tk.SlackBuild | 4 + python/alabaster/README | 13 - python/alabaster/alabaster.SlackBuild | 97 - python/alabaster/alabaster.info | 10 - python/alabaster/slack-desc | 19 - python/gi-docgen/README | 5 - python/gi-docgen/gi-docgen.SlackBuild | 98 - python/gi-docgen/gi-docgen.info | 10 - python/gi-docgen/slack-desc | 19 - python/gst-python/gst-python.SlackBuild | 4 +- python/gst-python/gst-python.info | 6 +- python/imagesize/imagesize.SlackBuild | 4 - python/numexpr/numexpr.SlackBuild | 5 +- python/numexpr/numexpr.info | 6 +- python/pikepdf/pikepdf.SlackBuild | 2 +- python/pikepdf/pikepdf.info | 6 +- python/pybind11/pybind11.SlackBuild | 2 +- python/pybind11/pybind11.info | 6 +- python/pygsl/pygsl.SlackBuild | 33 +- python/pygsl/pygsl.info | 6 +- python/python-importlib_metadata/README | 4 - .../python-importlib_metadata.SlackBuild | 88 - .../python-importlib_metadata.info | 10 - python/python-importlib_metadata/slack-desc | 19 - python/python-pcapy/python-pcapy.SlackBuild | 4 +- python/python-pcapy/python-pcapy.info | 6 +- python/python-smartypants/README | 4 - .../python-smartypants.SlackBuild | 96 - .../python-smartypants.info | 10 - python/python-smartypants/slack-desc | 19 - python/python-zipp/README | 2 - python/python-zipp/python-zipp.SlackBuild | 86 - python/python-zipp/python-zipp.info | 10 - python/python-zipp/slack-desc | 19 - python/python2-lxml/python2-lxml.SlackBuild | 2 +- python/python2-lxml/python2-lxml.info | 6 +- .../python2-pygame/python2-pygame.SlackBuild | 2 +- python/python2-six/README | 5 + python/python2-six/python2-six.SlackBuild | 93 + python/python2-six/python2-six.info | 10 + python/python2-six/slack-desc | 19 + python/python3-anyio/python3-anyio.info | 2 +- .../python3-async-lru/python3-async-lru.info | 2 +- python/python3-babel/README | 10 - python/python3-babel/python3-babel.SlackBuild | 89 - python/python3-babel/python3-babel.info | 12 - python/python3-babel/slack-desc | 19 - python/python3-build/README | 9 - python/python3-build/python3-build.SlackBuild | 89 - python/python3-build/python3-build.info | 10 - python/python3-build/slack-desc | 19 - python/python3-calver/README | 4 - .../python3-calver/python3-calver.SlackBuild | 83 - python/python3-calver/python3-calver.info | 10 - python/python3-calver/slack-desc | 19 - python/python3-dnspython/README | 8 - .../python3-dnspython.SlackBuild | 84 - .../python3-dnspython/python3-dnspython.info | 10 - python/python3-dnspython/slack-desc | 19 - python/python3-editables/README | 6 - .../python3-editables.SlackBuild | 97 - .../python3-editables/python3-editables.info | 10 - python/python3-editables/slack-desc | 19 - python/python3-exceptiongroup/README | 4 - .../python3-exceptiongroup.SlackBuild | 80 - .../python3-exceptiongroup.info | 10 - python/python3-exceptiongroup/slack-desc | 19 - python/python3-flit_core/README | 9 - .../python3-flit_core.SlackBuild | 82 - .../python3-flit_core/python3-flit_core.info | 10 - python/python3-flit_core/slack-desc | 19 - python/python3-glad/README | 5 - python/python3-glad/python3-glad.SlackBuild | 83 - python/python3-glad/python3-glad.info | 10 - python/python3-glad/slack-desc | 19 - python/python3-h5py/python3-h5py.SlackBuild | 7 +- python/python3-hatch_vcs/README | 4 - .../python3-hatch_vcs.SlackBuild | 86 - .../python3-hatch_vcs/python3-hatch_vcs.info | 10 - python/python3-hatch_vcs/slack-desc | 19 - python/python3-hatchling/README | 10 - .../python3-hatchling.SlackBuild | 85 - .../python3-hatchling/python3-hatchling.info | 10 - python/python3-hatchling/slack-desc | 19 - python/python3-installer/README | 3 - .../python3-installer.SlackBuild | 100 - .../python3-installer/python3-installer.info | 10 - python/python3-installer/slack-desc | 19 - python/python3-lxml/README | 5 - python/python3-lxml/python3-lxml.SlackBuild | 95 - python/python3-lxml/python3-lxml.info | 10 - python/python3-lxml/slack-desc | 19 - python/python3-meson-opt/README | 18 - .../python3-meson-opt.SlackBuild | 90 - .../python3-meson-opt/python3-meson-opt.info | 10 - python/python3-meson-opt/slack-desc | 19 - python/python3-mesonpy/README | 12 - .../python3-mesonpy.SlackBuild | 87 - python/python3-mesonpy/python3-mesonpy.info | 10 - python/python3-mesonpy/slack-desc | 19 - python/python3-numba/python3-numba.SlackBuild | 2 +- python/python3-numba/python3-numba.info | 6 +- .../no-ADE-download-4.10.0.84.diff | 37 + python/python3-opencv/no-ADE-download.diff | 37 - .../python3-opencv/python3-opencv.SlackBuild | 10 +- python/python3-opencv/python3-opencv.info | 10 +- .../sync_with_sci-build-4.5.5.64.diff | 25 - python/python3-packaging-opt/README | 6 - .../python3-packaging-opt.SlackBuild | 100 - .../python3-packaging-opt.info | 10 - python/python3-packaging-opt/slack-desc | 19 - .../python3-pandas/python3-pandas.SlackBuild | 13 +- python/python3-pandas/python3-pandas.info | 6 +- python/python3-pathspec/README | 6 - .../python3-pathspec.SlackBuild | 80 - python/python3-pathspec/python3-pathspec.info | 10 - python/python3-pathspec/slack-desc | 19 - python/python3-pluggy/README | 6 - .../python3-pluggy/python3-pluggy.SlackBuild | 86 - python/python3-pluggy/python3-pluggy.info | 10 - python/python3-pluggy/slack-desc | 19 - python/python3-psutil/README | 6 - .../python3-psutil/python3-psutil.SlackBuild | 80 - python/python3-psutil/python3-psutil.info | 10 - python/python3-psutil/slack-desc | 19 - .../python3-pygame/python3-pygame.SlackBuild | 8 +- python/python3-pygame/python3-pygame.info | 6 +- python/python3-pyicu/python3-pyicu.SlackBuild | 6 +- python/python3-pyicu/python3-pyicu.info | 6 +- python/python3-pyproject-hooks/README | 9 - .../python3-pyproject-hooks.SlackBuild | 84 - .../python3-pyproject-hooks.info | 10 - python/python3-pyproject-hooks/slack-desc | 19 - python/python3-pyproject-metadata/README | 8 - .../python3-pyproject-metadata.SlackBuild | 88 - .../python3-pyproject-metadata.info | 10 - python/python3-pyproject-metadata/slack-desc | 19 - python/python3-setuptools-opt/README | 12 - .../python3-setuptools-opt.SlackBuild | 130 - .../python3-setuptools-opt.info | 10 - .../setuptools.x86_64.diff.gz | Bin 543 -> 0 bytes python/python3-setuptools-opt/slack-desc | 19 - python/python3-setuptools-scm-opt/README | 17 - .../python3-setuptools-scm-opt.SlackBuild | 98 - .../python3-setuptools-scm-opt.info | 10 - python/python3-setuptools-scm-opt/slack-desc | 19 - .../python3-setuptools_scm_git_archive/README | 5 - ...hon3-setuptools_scm_git_archive.SlackBuild | 77 - .../python3-setuptools_scm_git_archive.info | 10 - .../slack-desc | 19 - .../python3-statsmodels.SlackBuild | 5 +- .../python3-statsmodels.info | 6 +- python/python3-tomli-opt/README | 4 - .../python3-tomli-opt.SlackBuild | 94 - .../python3-tomli-opt/python3-tomli-opt.info | 10 - python/python3-tomli-opt/slack-desc | 19 - python/python3-tomli_w/README | 5 - .../python3-tomli_w.SlackBuild | 80 - python/python3-tomli_w/python3-tomli_w.info | 10 - python/python3-tomli_w/slack-desc | 19 - python/python3-trove-classifiers/README | 4 - .../python3-trove-classifiers.SlackBuild | 80 - .../python3-trove-classifiers.info | 10 - python/python3-trove-classifiers/slack-desc | 19 - python/python3-typogrify/README | 5 - .../python3-typogrify.SlackBuild | 95 - .../python3-typogrify/python3-typogrify.info | 10 - python/python3-typogrify/slack-desc | 19 - python/python3-versioneer/README | 7 - .../python3-versioneer.SlackBuild | 82 - .../python3-versioneer.info | 10 - python/python3-versioneer/slack-desc | 19 - python/python3-webencodings/README | 13 - .../python3-webencodings.SlackBuild | 99 - .../python3-webencodings.info | 10 - python/python3-webencodings/slack-desc | 19 - python/python3-wheel/README | 6 - python/python3-wheel/python3-wheel.SlackBuild | 80 - python/python3-wheel/python3-wheel.info | 10 - python/python3-wheel/slack-desc | 19 - .../snowballstemmer.SlackBuild | 1 - python/sphinx-rtd-theme/README | 7 - python/sphinx-rtd-theme/slack-desc | 19 - .../sphinx-rtd-theme.SlackBuild | 80 - python/sphinx-rtd-theme/sphinx-rtd-theme.info | 10 - python/sphinxcontrib-applehelp/README | 2 - python/sphinxcontrib-applehelp/slack-desc | 19 - .../sphinxcontrib-applehelp.SlackBuild | 85 - .../sphinxcontrib-applehelp.info | 10 - python/sphinxcontrib-devhelp/README | 2 - python/sphinxcontrib-devhelp/slack-desc | 19 - .../sphinxcontrib-devhelp.SlackBuild | 85 - .../sphinxcontrib-devhelp.info | 10 - python/sphinxcontrib-htmlhelp/README | 1 - python/sphinxcontrib-htmlhelp/slack-desc | 19 - .../sphinxcontrib-htmlhelp.SlackBuild | 85 - .../sphinxcontrib-htmlhelp.info | 10 - python/sphinxcontrib-jsmath/README | 2 - python/sphinxcontrib-jsmath/slack-desc | 19 - .../sphinxcontrib-jsmath.SlackBuild | 83 - .../sphinxcontrib-jsmath.info | 10 - python/sphinxcontrib-qthelp/README | 2 - python/sphinxcontrib-qthelp/slack-desc | 19 - .../sphinxcontrib-qthelp.SlackBuild | 85 - .../sphinxcontrib-qthelp.info | 10 - python/sphinxcontrib-serializinghtml/README | 2 - .../sphinxcontrib-serializinghtml/slack-desc | 19 - .../sphinxcontrib-serializinghtml.SlackBuild | 85 - .../sphinxcontrib-serializinghtml.info | 10 - system/adobe-source-code-pro-font/README | 3 - .../adobe-source-code-pro-font.SlackBuild | 81 - .../adobe-source-code-pro-font.info | 10 - system/adobe-source-code-pro-font/doinst.sh | 9 - system/adobe-source-code-pro-font/slack-desc | 19 - system/afpfs-ng/afpfs-ng.SlackBuild | 2 +- system/aterm/README | 10 - system/aterm/aterm.SlackBuild | 125 - system/aterm/aterm.info | 10 - .../patches/01-display-security-issue.diff | 24 - system/aterm/patches/02-deadkeys.diff | 35 - system/aterm/patches/03-dpy.diff | 28 - .../aterm/patches/05-configure-clang16.diff | 23 - system/aterm/slack-desc | 19 - system/audit/audit.SlackBuild | 5 + system/bat/bat.SlackBuild | 2 +- system/brlaser/brlaser.SlackBuild | 1 + system/bubblewrap/bubblewrap.SlackBuild | 31 +- system/bubblewrap/bubblewrap.info | 6 +- system/ccid/README | 11 - system/ccid/ccid.SlackBuild | 124 - system/ccid/ccid.info | 10 - system/ccid/slack-desc | 19 - .../cndrvcups-capt/cndrvcups-capt.SlackBuild | 2 +- .../cndrvcups-common.SlackBuild | 2 +- system/cnijfilter2/cnijfilter2.SlackBuild | 9 +- system/cnijfilter2/cnijfilter2.info | 6 +- system/cnijfilter2/gcc10.patch | 11 - .../patches/add-missing-import.patch | 11 + .../patches/fix-libxml2-config.patch | 24 + system/cnijfilter2/patches/gcc15-fix.patch | 14 + system/conky/conky.SlackBuild | 2 +- system/corectrl/corectrl.SlackBuild | 2 +- system/corectrl/corectrl.info | 8 +- system/corectrl/corectrl.patch | 7 +- system/cowsql/conflicting-types.patch | 54 + system/cowsql/cowsql.SlackBuild | 5 +- system/d-feet/d-feet.SlackBuild | 4 + system/d-feet/data_meson_build.patch | 20 + system/detox/detox.SlackBuild | 4 +- system/detox/detox.info | 6 +- system/encfs/encfs.SlackBuild | 1 + .../epson-inkjet-printer-escpr.SlackBuild | 2 +- .../epson-inkjet-printer-escpr2.SlackBuild | 2 +- system/evhz/evhz.SlackBuild | 2 + system/evhz/gcc15.patch | 13 + .../fakechroot-2.20.1-glibc-2.33.patch | 469 --- system/fakechroot/fakechroot.SlackBuild | 6 +- system/fakechroot/patches/104.patch | 1727 ++++++++ system/fakechroot/patches/80.patch | 22 + system/fakechroot/patches/autoupdate.patch | 40 + ...1fb9538f680af2f31e864c555414ccba842a.patch | 102 + system/fakechroot/patches/disable_cp.t.patch | 11 + .../patches/fix_test_on_32bits.patch | 38 + system/font-manager/README | 3 - system/font-manager/font-manager.SlackBuild | 4 +- system/font-manager/font-manager.info | 6 +- system/freeipmi/freeipmi.SlackBuild | 7 +- system/freeipmi/patches/c23.patch | 22 + system/freeipmi/{ => patches}/header.patch | 0 system/freeipmi/{ => patches}/include.patch | 0 system/freeipmi/{ => patches}/prototype.patch | 0 system/fsv/fsv.SlackBuild | 2 +- system/gnome-disk-utility/66.patch | 95 + .../gnome-disk-utility.SlackBuild | 2 + system/gnome-vfs/gnome-vfs.SlackBuild | 4 +- system/gnome-vfs/openssl-1.1.patch | 26 - .../gnome-vfs-2.8.2-browser_default.patch | 20 + system/gnome-vfs/patches/gnome-vfs2-c99.patch | 16 + .../patches/gnome-vfs2-configure-c99.patch | 21 + system/gnome-vfs/patches/openssl-1.1.patch | 26 + .../heirloom-sh/heirloom-sh-glibc-2.34.patch | 18 + system/heirloom-sh/heirloom-sh.SlackBuild | 2 + system/iotop/iotop.SlackBuild | 2 +- system/ipmitool/ipmitool.SlackBuild | 56 +- system/ipmitool/ipmitool.info | 8 +- .../patches/0001-CVE-2011-4339-OpenIPMI.patch | 25 - system/ipmitool/patches/0002-openssl.patch | 89 - .../0003-ipmitool-1.8.11-set-kg-key.patch | 240 -- system/ipmitool/patches/0004-slowswid.patch | 16 - .../patches/0005-sensor-id-length.patch | 16 - system/ipmitool/patches/0006-enable-usb.patch | 21 - .../ipmitool/patches/0007-check-input.patch | 41 - system/ipmitool/patches/0008-add-extern.patch | 40 - .../ipmitool/patches/0009-best-cipher.patch | 864 ---- .../patches/0010-pef-missing-newline.patch | 33 - .../0011-expand-sensor-name-column.patch | 57 - .../ipmitool/patches/0012-CVE-2020-5208.patch | 378 -- system/jq/README | 5 - system/jq/jq.SlackBuild | 108 - system/jq/jq.info | 10 - system/jq/slack-desc | 19 - system/ktsuss/README | 4 - system/ktsuss/ktsuss.SlackBuild | 112 - system/ktsuss/ktsuss.info | 10 - system/ktsuss/slack-desc | 19 - system/lirc/lirc.SlackBuild | 40 +- system/lirc/lirc.info | 6 +- system/mongodb/mongodb.SlackBuild | 4 +- system/mongodb/mongodb.info | 8 +- system/noto-emoji/README | 1 - system/noto-emoji/doinst.sh | 11 - system/noto-emoji/noto-emoji.SlackBuild | 74 - system/noto-emoji/noto-emoji.info | 10 - system/noto-emoji/slack-desc | 19 - system/nut/README | 8 - system/nut/README.SLACKWARE | 43 - system/nut/doinst.sh | 21 - system/nut/nut.SlackBuild | 163 - system/nut/nut.info | 10 - system/nut/nut_kill_inverter | 15 - system/nut/nut_restart_udev | 12 - system/nut/rc.ups | 76 - system/nut/slack-desc | 19 - system/nvidia-firmware/nvidia-firmware.info | 8 +- system/open-vm-tools/751.patch | 23 + system/open-vm-tools/open-vm-tools.SlackBuild | 11 +- system/open-vm-tools/open-vm-tools.info | 6 +- system/opensc/README | 23 - system/opensc/doinst.sh | 18 - system/opensc/opensc.SlackBuild | 129 - system/opensc/opensc.info | 10 - system/opensc/slack-desc | 19 - system/ostree/ostree.SlackBuild | 10 +- system/ostree/ostree.info | 6 +- system/passwordsafe/passwordsafe.SlackBuild | 1 + system/pcem/pcem.SlackBuild | 11 +- system/pcem/x86-build.diff.gz | Bin 0 -> 249 bytes system/pcsc-lite/README | 19 - system/pcsc-lite/README.SLACKWARE | 32 - system/pcsc-lite/doinst.sh | 26 - system/pcsc-lite/pcsc-lite.SlackBuild | 179 - system/pcsc-lite/pcsc-lite.info | 10 - system/pcsc-lite/rc.pcscd | 66 - system/pcsc-lite/slack-desc | 19 - system/piper/README | 4 - system/piper/piper.SlackBuild | 6 +- system/pmount/pmount.SlackBuild | 2 +- system/polyglotman/gcc14.patch | 21 + system/polyglotman/polyglotman.SlackBuild | 2 + system/qemu/README | 16 +- system/qemu/qemu-10.0.3-pip-25.2-compat.patch | 93 + system/qemu/qemu.SlackBuild | 11 +- system/qemu/qemu.info | 8 +- system/qps/qps.SlackBuild | 1 + system/qt-sudo/README | 3 + system/qt-sudo/qt-sudo.SlackBuild | 96 + system/qt-sudo/qt-sudo.info | 10 + system/qt-sudo/slack-desc | 19 + system/qterminal/qterminal.SlackBuild | 1 + system/qtgzmanager/qtgzmanager.SlackBuild | 13 +- system/qtgzmanager/qtgzmanager.info | 8 +- system/runit/runit.SlackBuild | 8 +- system/rxvt/rxvt.SlackBuild | 6 +- system/sboui/sboui.SlackBuild | 1 + system/scdoc/README | 3 - system/scdoc/scdoc.SlackBuild | 105 - system/scdoc/scdoc.info | 10 - system/scdoc/slack-desc | 19 - system/schedtool/schedtool-1.3.0-c99.patch | 33 + system/schedtool/schedtool.SlackBuild | 1 + system/seahorse/patches/GnuPG-2.4.patch | 25 + ...d_seahorse_pkcs11_backend_initialize.patch | 40 + .../patches/refactor_ssh_key_parsing.patch | 512 +++ .../patches/seahorse-ssh-return-type.patch | 25 + system/seahorse/seahorse.SlackBuild | 40 +- system/seahorse/seahorse.info | 6 +- system/spacefm/patches/gcc10.patch | 92 + system/spacefm/patches/glibc-2.28.patch | 12 + .../spacefm-1.0.6-c23-bool-keyword.patch | 119 + .../spacefm-1.0.6-c23-function-proto.patch | 215 + .../patches/spacefm-1.0.6-c99-type-cast.patch | 57 + system/spacefm/spacefm.SlackBuild | 11 +- system/stow/README | 13 - system/stow/slack-desc | 19 - system/stow/stow.SlackBuild | 109 - system/stow/stow.info | 10 - system/tini/tini.SlackBuild | 1 + system/tp_smapi/tp_smapi.SlackBuild | 2 +- system/tp_smapi/tp_smapi.info | 6 +- system/trrntzip/slack-desc | 2 +- system/trrntzip/trrntzip.SlackBuild | 30 +- system/trrntzip/trrntzip.info | 8 +- system/uhd/uhd.SlackBuild | 9 + system/usbtop/usbtop.SlackBuild | 1 + system/veracrypt/32bit.patch | 23 + system/veracrypt/veracrypt.SlackBuild | 13 +- system/veracrypt/veracrypt.info | 8 +- system/vice/vice.SlackBuild | 4 +- system/vinterm/includes.diff | 10 + system/vinterm/vinterm.SlackBuild | 4 +- ...irt-viewer-10.0_p20210730-meson-0.61.patch | 36 + system/virt-viewer/virt-viewer.SlackBuild | 2 + system/virtiofsd/README | 19 + system/virtiofsd/slack-desc | 19 + system/virtiofsd/virtiofsd.SlackBuild | 104 + system/virtiofsd/virtiofsd.info | 12 + system/virtualbox-addons/gcc13.patch | 11 + .../virtualbox-addons.SlackBuild | 2 + system/virtualbox-kernel/kernel-6.9.patch | 73 + .../virtualbox-kernel.SlackBuild | 2 + system/virtualbox/virtualbox.SlackBuild | 4 +- system/wayland-utils/README | 9 - system/wayland-utils/slack-desc | 19 - system/wayland-utils/wayland-utils.SlackBuild | 105 - system/wayland-utils/wayland-utils.info | 10 - system/xar/xar.SlackBuild | 2 + system/xbindkeys/xbindkeys.SlackBuild | 2 + system/xbindkeys/xbindkeys.info | 2 +- system/xboxdrv-linux/fix-60-sec-delay.patch | 27 - system/xboxdrv-linux/scons-py3.patch | 63 - system/xboxdrv-linux/scons-v4.2.0.patch | 20 - system/xboxdrv-linux/xboxdrv-linux.SlackBuild | 19 +- system/xboxdrv-linux/xboxdrv-linux.info | 8 +- system/xboxdrv-linux/xboxdrvctl-py3.patch | 73 - 1548 files changed, 25837 insertions(+), 31789 deletions(-) delete mode 100644 academic/labplot2/README delete mode 100644 academic/labplot2/doinst.sh delete mode 100644 academic/labplot2/labplot2.SlackBuild delete mode 100644 academic/labplot2/labplot2.info delete mode 100644 academic/labplot2/slack-desc delete mode 100644 academic/qalculate-gtk/README delete mode 100644 academic/qalculate-gtk/doinst.sh delete mode 100644 academic/qalculate-gtk/qalculate-gtk.SlackBuild delete mode 100644 academic/qalculate-gtk/qalculate-gtk.info delete mode 100644 academic/qalculate-gtk/slack-desc delete mode 100644 academic/stellarsolver/README delete mode 100644 academic/stellarsolver/doinst.sh delete mode 100644 academic/stellarsolver/slack-desc delete mode 100644 academic/stellarsolver/stellarsolver.SlackBuild delete mode 100644 academic/stellarsolver/stellarsolver.info delete mode 100644 academic/suitesparse/README delete mode 100644 academic/suitesparse/slack-desc delete mode 100644 academic/suitesparse/suitesparse.SlackBuild delete mode 100644 academic/suitesparse/suitesparse.info create mode 100644 audio/SuperCollider/supercollider-3.12.2-libsndfile-110-compat.patch create mode 100644 audio/clementine/cmake4.patch delete mode 100644 audio/flac-opt/README delete mode 100644 audio/flac-opt/flac-opt-dev.sh delete mode 100644 audio/flac-opt/flac-opt.SlackBuild delete mode 100644 audio/flac-opt/flac-opt.info delete mode 100644 audio/flac-opt/flac-opt.sh delete mode 100644 audio/flac-opt/slack-desc create mode 100644 audio/guitarix/patches/always_inline.patch create mode 100644 audio/guitarix/patches/gcc-13.patch create mode 100644 audio/jack_capture/gcc14.patch create mode 100644 audio/quodlibet/python3.12.patch delete mode 100644 audio/wireplumber/README delete mode 100644 audio/wireplumber/doinst.sh delete mode 100644 audio/wireplumber/slack-desc delete mode 100644 audio/wireplumber/wireplumber-disable.sh delete mode 100644 audio/wireplumber/wireplumber-enable.sh delete mode 100644 audio/wireplumber/wireplumber.SlackBuild delete mode 100644 audio/wireplumber/wireplumber.desktop.sample delete mode 100644 audio/wireplumber/wireplumber.info create mode 100644 business/ledger/boost-185.patch create mode 100644 desktop/florence/florence-c99.patch delete mode 100644 desktop/labwc/README delete mode 100644 desktop/labwc/doinst.sh delete mode 100644 desktop/labwc/labwc.SlackBuild delete mode 100644 desktop/labwc/labwc.info delete mode 100644 desktop/labwc/slack-desc create mode 100644 desktop/murrine/gtk-murrine-engine-c99.patch create mode 100644 desktop/obconf/obconf-c99.patch create mode 100644 desktop/openbox/patches/917204_undecorated_maximized_no_border.patch create mode 100644 desktop/openbox/patches/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch create mode 100644 desktop/openbox/patches/debian-887908.patch create mode 100644 desktop/rofi/fix_xfce4-terminal_binary_name.patch create mode 100644 desktop/tint2/tint2conf-libm-1082699.patch delete mode 100644 desktop/waybar/66b71cc8577d1296323b637afc89524a00779776.patch.gz create mode 100644 desktop/wmCalClock/1.26-fix-KnR-prototypes.patch delete mode 100644 desktop/xfce4-xkb-plugin/README delete mode 100644 desktop/xfce4-xkb-plugin/slack-desc delete mode 100644 desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild delete mode 100644 desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info delete mode 100644 development/Sphinx/README delete mode 100644 development/Sphinx/Sphinx.SlackBuild delete mode 100644 development/Sphinx/Sphinx.info delete mode 100644 development/Sphinx/slack-desc delete mode 100644 development/abseil-cpp/README delete mode 100644 development/abseil-cpp/abseil-cpp.SlackBuild delete mode 100644 development/abseil-cpp/abseil-cpp.info delete mode 100644 development/abseil-cpp/slack-desc create mode 100644 development/avr-gdb/fix-const-compile.patch create mode 100644 development/bazel/abseil-missing-stdint.patch create mode 100644 development/bazel/apply-abseil-stdint.patch delete mode 100644 development/cargo-c/README delete mode 100644 development/cargo-c/cargo-c.SlackBuild delete mode 100644 development/cargo-c/cargo-c.info delete mode 100644 development/cargo-c/slack-desc delete mode 100644 development/cargo-vendor-filterer/README delete mode 100644 development/cargo-vendor-filterer/cargo-mkvendored.sh delete mode 100644 development/cargo-vendor-filterer/cargo-vendor-filterer.SlackBuild delete mode 100644 development/cargo-vendor-filterer/cargo-vendor-filterer.info delete mode 100644 development/cargo-vendor-filterer/slack-desc create mode 100644 development/gambas3/gambas-3.19.0-poppler-24.02.0.patch delete mode 100644 development/google-go-lang/README delete mode 100644 development/google-go-lang/google-go-lang.SlackBuild delete mode 100644 development/google-go-lang/google-go-lang.info delete mode 100644 development/google-go-lang/slack-desc delete mode 100644 development/gtest/README delete mode 100644 development/gtest/gtest.SlackBuild delete mode 100644 development/gtest/gtest.info delete mode 100644 development/gtest/slack-desc create mode 100644 development/jam/patches/01_jam-2.5-overflow.patch create mode 100644 development/jam/patches/02_jam-missing-includes.patch create mode 100644 development/jam/patches/03_jam-implicit-int.patch create mode 100644 development/jam/patches/04_jam-2.5-argv-fixup.patch create mode 100644 development/jam/patches/05_jam-2.6.1-fix-typo.patch delete mode 100644 development/lua/README delete mode 100644 development/lua/lua.SlackBuild delete mode 100644 development/lua/lua.info delete mode 100644 development/lua/lua.pc delete mode 100644 development/lua/lua.usr.local.patch delete mode 100644 development/lua/slack-desc delete mode 100644 development/luajit/README delete mode 100644 development/luajit/luajit.SlackBuild delete mode 100644 development/luajit/luajit.info delete mode 100644 development/luajit/slack-desc delete mode 100644 development/mold/README delete mode 100644 development/mold/mold.SlackBuild delete mode 100644 development/mold/mold.info delete mode 100644 development/mold/slack-desc delete mode 100644 development/nodejs/README delete mode 100644 development/nodejs/nodejs.SlackBuild delete mode 100644 development/nodejs/nodejs.info delete mode 100644 development/nodejs/npm.sh delete mode 100644 development/nodejs/slack-desc create mode 100644 development/oneTBB/includes.patch create mode 100644 development/oneTBB/unused.patch delete mode 100644 development/pahole/README delete mode 100644 development/pahole/pahole.SlackBuild delete mode 100644 development/pahole/pahole.info delete mode 100644 development/pahole/slack-desc delete mode 100644 development/protobuf3/README delete mode 100644 development/protobuf3/protobuf3.SlackBuild delete mode 100644 development/protobuf3/protobuf3.info delete mode 100644 development/protobuf3/slack-desc delete mode 100644 development/protobuf3/soversion.patch delete mode 100644 development/python3-numpy/README delete mode 100644 development/python3-numpy/README.ATLAS delete mode 100644 development/python3-numpy/python3-numpy.SlackBuild delete mode 100644 development/python3-numpy/python3-numpy.info delete mode 100644 development/python3-numpy/slack-desc delete mode 100644 development/rust-opt/README delete mode 100644 development/rust-opt/rust-opt.SlackBuild delete mode 100644 development/rust-opt/rust-opt.info delete mode 100644 development/rust-opt/slack-desc delete mode 100644 development/rust16/README delete mode 100644 development/rust16/rust16.SlackBuild delete mode 100644 development/rust16/rust16.info delete mode 100644 development/rust16/slack-desc delete mode 100644 development/snappy/73.patch create mode 100644 development/snappy/patches/cmake_add_pkgconfig.patch create mode 100644 development/snappy/patches/use_system_gtest.patch create mode 100644 development/snappy/snappy.pc.in delete mode 100644 development/systemtap/int.patch create mode 100644 development/tora/gcc14.patch delete mode 100644 development/valgrind/README delete mode 100644 development/valgrind/slack-desc delete mode 100644 development/valgrind/valgrind.SlackBuild delete mode 100644 development/valgrind/valgrind.info create mode 100644 games/armagetronad/patches/libxml2-2.14_1.patch create mode 100644 games/armagetronad/patches/libxml2-2.14_2.patch delete mode 100644 games/gnugo/README delete mode 100644 games/gnugo/gnugo.SlackBuild delete mode 100644 games/gnugo/gnugo.info delete mode 100644 games/gnugo/slack-desc create mode 100644 games/hedgewars/cmake4.patch create mode 100644 games/higan/includes.diff create mode 100644 games/innoextract/boost.diff create mode 100644 games/openttd/icu.patch create mode 100644 games/paranoia/gcc-14.diff create mode 100644 games/pokerth/patches/boost_1.89.patch create mode 100644 games/pokerth/patches/boost_1.89_2.patch delete mode 100644 games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix1.patch delete mode 100644 games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch create mode 100644 games/smc/boost-1.89.patch create mode 100644 games/supertuxkart/cmake4.patch create mode 100644 games/supertuxkart/gcc15-1.patch create mode 100644 games/supertuxkart/gcc15-2.patch create mode 100644 games/tome/aur-tome4.patch create mode 100644 games/trackballs/cross.patch create mode 100644 games/warzone2100/SQLiteCPP-gcc15.patch delete mode 100644 gis/grass/gdal-3.3.patch delete mode 100644 gis/opencpn/README delete mode 100644 gis/opencpn/doinst.sh delete mode 100644 gis/opencpn/opencpn.SlackBuild delete mode 100644 gis/opencpn/opencpn.info delete mode 100644 gis/opencpn/slack-desc delete mode 100644 graphics/OpenShadingLanguage/llvm-20.patch create mode 100644 graphics/darktable/gcc-15.patch create mode 100644 graphics/dblatex/patches/footmisx.patch create mode 100644 graphics/dblatex/patches/replace-imp-by-importlib.patch create mode 100644 graphics/dia/patches/dia-0.97.3-c99.patch create mode 100644 graphics/dia/patches/dia-0.97.3-configure-clang16.patch create mode 100644 graphics/dia/patches/dia-0.97.3-freetype_pkgconfig.patch rename graphics/dia/{ => patches}/dia-enable-html-docs.patch (100%) create mode 100644 graphics/djview4/patches/0001-cross-build-pkg-config-info.patch create mode 100644 graphics/djview4/patches/0002-debian-changes.patch create mode 100644 graphics/feh/mkstemp.patch create mode 100644 graphics/fontforge/gettext-0.22.patch create mode 100644 graphics/fritzing/gcc14.patch create mode 100644 graphics/gimagereader/remove_enchant-provider.patch delete mode 100644 graphics/graphviz/README delete mode 100644 graphics/graphviz/doinst.sh delete mode 100644 graphics/graphviz/graphviz.SlackBuild delete mode 100644 graphics/graphviz/graphviz.info delete mode 100644 graphics/graphviz/graphviz.ini delete mode 100644 graphics/graphviz/slack-desc delete mode 100644 graphics/hugin/boost-1.85.0-patch.gz create mode 100644 graphics/imv/imv-4.5.0-Link-to-the-common-ICU-library.patch create mode 100644 graphics/inkscape/poppler-25.06.patch create mode 100644 graphics/inkscape/poppler-25.07.patch create mode 100644 graphics/inkscape/poppler-25.09.patch delete mode 100644 graphics/kColorPicker/README delete mode 100644 graphics/kColorPicker/kColorPicker.SlackBuild delete mode 100644 graphics/kColorPicker/kColorPicker.info delete mode 100644 graphics/kColorPicker/slack-desc delete mode 100644 graphics/kImageAnnotator/README delete mode 100644 graphics/kImageAnnotator/kImageAnnotator.SlackBuild delete mode 100644 graphics/kImageAnnotator/kImageAnnotator.info delete mode 100644 graphics/kImageAnnotator/slack-desc delete mode 100644 graphics/libplacebo/README delete mode 100644 graphics/libplacebo/libplacebo.SlackBuild delete mode 100644 graphics/libplacebo/libplacebo.info delete mode 100644 graphics/libplacebo/slack-desc delete mode 100644 graphics/libplacebo/use_meson-0.59.4.diff create mode 100644 graphics/luminance-hdr/patches/luminance-hdr-2.5.1-openmp-automagic.patch create mode 100644 graphics/luminance-hdr/patches/luminance-hdr-2.6.0-cmake.patch create mode 100644 graphics/luminance-hdr/patches/luminance-hdr-2.6.0-docs.patch create mode 100644 graphics/luminance-hdr/patches/luminance-hdr-2.6.0-no-git.patch create mode 100644 graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-exiv-0.28.x.patch create mode 100644 graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-fixheaders.patch create mode 100644 graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-openexr3.patch create mode 100644 graphics/mypaint/032a155.patch create mode 100644 graphics/mypaint/3b682d5.patch create mode 100644 graphics/openimageio/doinst.sh create mode 100644 graphics/rawtherapee/jpeg_turbo_3.0.3.patch create mode 100644 graphics/ufraw/patches/ufraw-0.22-exiv2-0.28.patch create mode 100644 graphics/vimiv-qt/build-with-pyproject-toml.patch create mode 100644 graphics/zbar/configure.ac.patch create mode 100644 haskell/ghc/patches/hp2ps-C-gnu17.patch create mode 100644 haskell/ghc/patches/sphinx-4-configuration.patch create mode 100644 haskell/ghc/patches/sphinx-6.patch delete mode 100644 libraries/Botan/botan-2.19.5-boost-1.87.patch delete mode 100644 libraries/CEGUI/CEGUI.SlackBuild delete mode 100644 libraries/CEGUI/CEGUI.info delete mode 100644 libraries/CEGUI/README delete mode 100644 libraries/CEGUI/slack-desc create mode 100644 libraries/MyGUI/cmake4.patch create mode 100644 libraries/ORBit2/patches/ORBit2-configure-c99.patch create mode 100644 libraries/ORBit2/patches/pointer-type.patch delete mode 100644 libraries/OpenBLAS/OpenBLAS.SlackBuild delete mode 100644 libraries/OpenBLAS/OpenBLAS.info delete mode 100644 libraries/OpenBLAS/README delete mode 100644 libraries/OpenBLAS/slack-desc delete mode 100644 libraries/appstream-glib/README delete mode 100644 libraries/appstream-glib/appstream-glib.SlackBuild delete mode 100644 libraries/appstream-glib/appstream-glib.info delete mode 100644 libraries/appstream-glib/slack-desc create mode 100644 libraries/argtable/patches/argtable-2.13-Fix-implicit-function-declaration.patch create mode 100644 libraries/argtable/patches/argtable-2.13-Fix-undeclared-library-function.patch create mode 100644 libraries/assimp/gcc-15.patch create mode 100644 libraries/aubio/ffmpeg7.patch delete mode 100644 libraries/bamf/add_compile_warning_flags.patch create mode 100644 libraries/bamf/bamf-no-gtester2xunit.patch create mode 100644 libraries/chromaprint/patches/aa67c95b.patch create mode 100644 libraries/chromaprint/patches/ffmpeg5.patch create mode 100644 libraries/chromaprint/patches/ffmpeg7.patch delete mode 100644 libraries/cmark/README delete mode 100644 libraries/cmark/cmark.SlackBuild delete mode 100644 libraries/cmark/cmark.info delete mode 100644 libraries/cmark/slack-desc create mode 100644 libraries/coeurl/curlwrap.patch create mode 100644 libraries/collada-dom/boost-1.85.patch create mode 100644 libraries/compiz-plugins-experimental/gcc13.patch create mode 100644 libraries/compiz-plugins-extra/gcc13.patch create mode 100644 libraries/compiz-plugins-main/compiz-plugins-main-0.8.18-gcc-14-fix.patch delete mode 100644 libraries/dav1d/README delete mode 100644 libraries/dav1d/dav1d.SlackBuild delete mode 100644 libraries/dav1d/dav1d.info delete mode 100644 libraries/dav1d/slack-desc delete mode 100644 libraries/ffms2/586d87de3f896d0c4ff01b21f572375e11f9c3f1.patch create mode 100644 libraries/flickcurl/includes.patch delete mode 100644 libraries/fmt/README delete mode 100644 libraries/fmt/fmt.SlackBuild delete mode 100644 libraries/fmt/fmt.info delete mode 100644 libraries/fmt/slack-desc create mode 100644 libraries/gevent/workaround-cython-bug.patch delete mode 100644 libraries/gspell/README delete mode 100644 libraries/gspell/gspell.SlackBuild delete mode 100644 libraries/gspell/gspell.info delete mode 100644 libraries/gspell/slack-desc delete mode 100644 libraries/gtk-layer-shell/README delete mode 100644 libraries/gtk-layer-shell/gtk-layer-shell.SlackBuild delete mode 100644 libraries/gtk-layer-shell/gtk-layer-shell.info delete mode 100644 libraries/gtk-layer-shell/slack-desc rename libraries/{gtksourceview4 => gtksourceview3}/README (100%) create mode 100644 libraries/gtksourceview3/d880929f02730e3a2d0e4f8fd69f2831b8ade4d0.patch create mode 100644 libraries/gtksourceview3/gtksourceview3.SlackBuild create mode 100644 libraries/gtksourceview3/gtksourceview3.info create mode 100644 libraries/gtksourceview3/slack-desc delete mode 100644 libraries/gtksourceview4/gtksourceview4.SlackBuild delete mode 100644 libraries/gtksourceview4/gtksourceview4.info delete mode 100644 libraries/gtksourceview4/slack-desc delete mode 100644 libraries/html5lib/README delete mode 100644 libraries/html5lib/html5lib.SlackBuild delete mode 100644 libraries/html5lib/html5lib.info delete mode 100644 libraries/html5lib/slack-desc delete mode 100644 libraries/iniparser/README delete mode 100644 libraries/iniparser/iniparser.SlackBuild delete mode 100644 libraries/iniparser/iniparser.info delete mode 100644 libraries/iniparser/slack-desc delete mode 100644 libraries/kirigami-addons/README delete mode 100644 libraries/kirigami-addons/kirigami-addons.SlackBuild delete mode 100644 libraries/kirigami-addons/kirigami-addons.info delete mode 100644 libraries/kirigami-addons/slack-desc delete mode 100644 libraries/lgi/README delete mode 100644 libraries/lgi/lgi.SlackBuild delete mode 100644 libraries/lgi/lgi.info delete mode 100644 libraries/lgi/slack-desc delete mode 100644 libraries/libadwaita/libadwaita-1.0.5-support-gtk-4.4.patch delete mode 100644 libraries/libadwaita/libadwaita-1.0.5-suppress-line-break-warnings.patch delete mode 100644 libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch delete mode 100644 libraries/libass/README delete mode 100644 libraries/libass/libass.SlackBuild delete mode 100644 libraries/libass/libass.info delete mode 100644 libraries/libass/slack-desc create mode 100644 libraries/libbonobo/libbonobo-2.32.1-c23.patch delete mode 100644 libraries/libdisplay-info/README delete mode 100644 libraries/libdisplay-info/libdisplay-info.SlackBuild delete mode 100644 libraries/libdisplay-info/libdisplay-info.info delete mode 100644 libraries/libdisplay-info/slack-desc delete mode 100644 libraries/libev/README delete mode 100644 libraries/libev/libev.SlackBuild delete mode 100644 libraries/libev/libev.info delete mode 100644 libraries/libev/slack-desc delete mode 100644 libraries/libgusb/README delete mode 100644 libraries/libgusb/libgusb.SlackBuild delete mode 100644 libraries/libgusb/libgusb.info delete mode 100644 libraries/libgusb/slack-desc delete mode 100644 libraries/libhandy/README delete mode 100644 libraries/libhandy/libhandy.SlackBuild delete mode 100644 libraries/libhandy/libhandy.info delete mode 100644 libraries/libhandy/slack-desc delete mode 100644 libraries/libindi/README delete mode 100644 libraries/libindi/doinst.sh delete mode 100644 libraries/libindi/libindi.SlackBuild delete mode 100644 libraries/libindi/libindi.info delete mode 100644 libraries/libindi/slack-desc create mode 100644 libraries/libmspub/gcc15.patch delete mode 100644 libraries/libnova/README delete mode 100644 libraries/libnova/libnova.SlackBuild delete mode 100644 libraries/libnova/libnova.info delete mode 100644 libraries/libnova/slack-desc create mode 100644 libraries/libosinfo/libxml2-2.14.patch create mode 100644 libraries/libportal/qt-6.9.patch create mode 100644 libraries/libpst/patches/0002-incompatible-pointer-i686.patch create mode 100644 libraries/libpst/patches/0003-gcc-c23-changes.patch create mode 100644 libraries/libpst/patches/m4-python310.patch delete mode 100644 libraries/libquicktime/libquicktime-ffmpeg3.patch create mode 100644 libraries/libquicktime/patches/libquicktime-1.2.4-CVE-2016-2399.patch create mode 100644 libraries/libquicktime/patches/libquicktime-1.2.4-CVE-2017-9122_et_al.patch rename libraries/libquicktime/{ => patches}/libquicktime-1.2.4-faad2.patch (100%) create mode 100644 libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg-codecs.patch rename libraries/libquicktime/{ => patches}/libquicktime-1.2.4-ffmpeg2.patch (100%) create mode 100644 libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg29.patch rename libraries/libquicktime/{ => patches}/libquicktime-1.2.4-ffmpeg4.patch (100%) create mode 100644 libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg5.patch create mode 100644 libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg7.patch create mode 100644 libraries/libquicktime/patches/libquicktime-1.2.4-libavutil.patch create mode 100644 libraries/libquicktime/patches/libquicktime-1.2.4-qtpng.patch create mode 100644 libraries/libsmi/gcc-14.patch create mode 100644 libraries/libsmi/gcc-15.patch delete mode 100644 libraries/libsoup3/README delete mode 100644 libraries/libsoup3/libsoup3.SlackBuild delete mode 100644 libraries/libsoup3/libsoup3.info delete mode 100644 libraries/libsoup3/slack-desc delete mode 100644 libraries/libtraceevent/README delete mode 100644 libraries/libtraceevent/libtraceevent.SlackBuild delete mode 100644 libraries/libtraceevent/libtraceevent.info delete mode 100644 libraries/libtraceevent/slack-desc delete mode 100644 libraries/libtracefs/README delete mode 100644 libraries/libtracefs/libtracefs.SlackBuild delete mode 100644 libraries/libtracefs/libtracefs.info delete mode 100644 libraries/libtracefs/slack-desc delete mode 100644 libraries/libunibreak/README delete mode 100644 libraries/libunibreak/libunibreak.SlackBuild delete mode 100644 libraries/libunibreak/libunibreak.info delete mode 100644 libraries/libunibreak/slack-desc create mode 100644 libraries/libzim/icu76.patch delete mode 100644 libraries/mujs/README delete mode 100644 libraries/mujs/mujs.SlackBuild delete mode 100644 libraries/mujs/mujs.info delete mode 100644 libraries/mujs/set-library-soname-version.diff delete mode 100644 libraries/mujs/slack-desc delete mode 100644 libraries/nghttp3/README delete mode 100644 libraries/nghttp3/nghttp3.SlackBuild delete mode 100644 libraries/nghttp3/nghttp3.info delete mode 100644 libraries/nghttp3/slack-desc create mode 100644 libraries/nlohmann_json/patches/1_6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch create mode 100644 libraries/nlohmann_json/patches/2_660d0b58565073975d6f5d94365d6cbf150a4cf8.patch delete mode 100644 libraries/nv-codec-headers/README delete mode 100644 libraries/nv-codec-headers/nv-codec-headers.SlackBuild delete mode 100644 libraries/nv-codec-headers/nv-codec-headers.info delete mode 100644 libraries/nv-codec-headers/slack-desc delete mode 100644 libraries/ogre/e34ef06bb0d49ce847efe3a80ebe01c9762ea0b1.patch create mode 100644 libraries/openvino/010-openvino-disable-werror.patch create mode 100644 libraries/openvino/020-openvino-use-protobuf-shared-libs.patch delete mode 100644 libraries/qt6/README delete mode 100644 libraries/qt6/README.SLACKWARE delete mode 100644 libraries/qt6/desktop/assistant-qt6.desktop delete mode 100644 libraries/qt6/desktop/designer-qt6.desktop delete mode 100644 libraries/qt6/desktop/linguist-qt6.desktop delete mode 100644 libraries/qt6/desktop/qdbusviewer-qt6.desktop delete mode 100644 libraries/qt6/doinst.sh delete mode 100644 libraries/qt6/newer_protobuf_1.patch delete mode 100644 libraries/qt6/newer_protobuf_2.patch delete mode 100644 libraries/qt6/profile.d/qt6.csh delete mode 100644 libraries/qt6/profile.d/qt6.sh delete mode 100644 libraries/qt6/qt6.SlackBuild delete mode 100644 libraries/qt6/qt6.info delete mode 100644 libraries/qt6/slack-desc delete mode 100644 libraries/seatd/README delete mode 100644 libraries/seatd/seatd.SlackBuild delete mode 100644 libraries/seatd/seatd.info delete mode 100644 libraries/seatd/slack-desc delete mode 100644 libraries/tree-sitter/README delete mode 100644 libraries/tree-sitter/slack-desc delete mode 100644 libraries/tree-sitter/tree-sitter.SlackBuild delete mode 100644 libraries/tree-sitter/tree-sitter.info delete mode 100644 libraries/wcslib/README delete mode 100644 libraries/wcslib/slack-desc delete mode 100644 libraries/wcslib/wcslib.SlackBuild delete mode 100644 libraries/wcslib/wcslib.info delete mode 100644 libraries/wlroots/README delete mode 100644 libraries/wlroots/slack-desc delete mode 100644 libraries/wlroots/wlroots.SlackBuild delete mode 100644 libraries/wlroots/wlroots.info delete mode 100644 libraries/wxsvg/gcc13.patch create mode 100644 libraries/yajl/patches/0009-cmake4.patch delete mode 100644 libraries/zstd-cmake/README delete mode 100644 libraries/zstd-cmake/slack-desc delete mode 100644 libraries/zstd-cmake/zstd-cmake.SlackBuild delete mode 100644 libraries/zstd-cmake/zstd-cmake.info delete mode 100644 libraries/zxing-cpp/README delete mode 100644 libraries/zxing-cpp/slack-desc delete mode 100644 libraries/zxing-cpp/zxing-cpp.SlackBuild delete mode 100644 libraries/zxing-cpp/zxing-cpp.info delete mode 100644 libraries/zxing-cpp/zxing.cmake.patch delete mode 100644 misc/cwiid/python310.patch create mode 100644 misc/cwiid/wmgui.desktop create mode 100644 misc/cwiid/wmgui.xpm delete mode 100644 misc/fcitx5-chinese-addons/README delete mode 100644 misc/fcitx5-chinese-addons/doinst.sh delete mode 100644 misc/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild delete mode 100644 misc/fcitx5-chinese-addons/fcitx5-chinese-addons.info delete mode 100644 misc/fcitx5-chinese-addons/slack-desc delete mode 100644 misc/fcitx5-configtool/README delete mode 100644 misc/fcitx5-configtool/doinst.sh delete mode 100644 misc/fcitx5-configtool/fcitx5-configtool.SlackBuild delete mode 100644 misc/fcitx5-configtool/fcitx5-configtool.info delete mode 100644 misc/fcitx5-configtool/slack-desc delete mode 100644 misc/fcitx5-gtk/README delete mode 100644 misc/fcitx5-gtk/fcitx5-gtk.SlackBuild delete mode 100644 misc/fcitx5-gtk/fcitx5-gtk.info delete mode 100644 misc/fcitx5-gtk/slack-desc create mode 100644 misc/fcitx5-mozc/0013-mozc-includes.patch delete mode 100644 misc/fcitx5-qt/README delete mode 100644 misc/fcitx5-qt/doinst.sh delete mode 100644 misc/fcitx5-qt/fcitx5-qt.SlackBuild delete mode 100644 misc/fcitx5-qt/fcitx5-qt.info delete mode 100644 misc/fcitx5-qt/slack-desc delete mode 100644 misc/fcitx5-table-extra/README delete mode 100644 misc/fcitx5-table-extra/doinst.sh delete mode 100644 misc/fcitx5-table-extra/fcitx5-table-extra.SlackBuild delete mode 100644 misc/fcitx5-table-extra/fcitx5-table-extra.info delete mode 100644 misc/fcitx5-table-extra/slack-desc delete mode 100644 misc/fcitx5-table-other/README delete mode 100644 misc/fcitx5-table-other/doinst.sh delete mode 100644 misc/fcitx5-table-other/fcitx5-table-other.SlackBuild delete mode 100644 misc/fcitx5-table-other/fcitx5-table-other.info delete mode 100644 misc/fcitx5-table-other/slack-desc delete mode 100644 misc/fcitx5/README delete mode 100644 misc/fcitx5/doinst.sh delete mode 100644 misc/fcitx5/fcitx5-autostart delete mode 100644 misc/fcitx5/fcitx5.SlackBuild delete mode 100644 misc/fcitx5/fcitx5.info delete mode 100644 misc/fcitx5/slack-desc delete mode 100644 misc/moreutils/README delete mode 100644 misc/moreutils/moreutils.SlackBuild delete mode 100644 misc/moreutils/moreutils.info delete mode 100644 misc/moreutils/slack-desc create mode 100644 misc/sdcv/gcc_14-modern_glib2.patch delete mode 100644 misc/seahorse-plugins/README delete mode 100644 misc/seahorse-plugins/doinst.sh delete mode 100644 misc/seahorse-plugins/seahorse-plugins.SlackBuild delete mode 100644 misc/seahorse-plugins/seahorse-plugins.info delete mode 100644 misc/seahorse-plugins/slack-desc delete mode 100644 misc/wkhtmltopdf/README delete mode 100644 misc/wkhtmltopdf/slack-desc delete mode 100644 misc/wkhtmltopdf/wkhtmltopdf.SlackBuild delete mode 100644 misc/wkhtmltopdf/wkhtmltopdf.info delete mode 100644 misc/xcb-imdkit/README delete mode 100644 misc/xcb-imdkit/slack-desc delete mode 100644 misc/xcb-imdkit/xcb-imdkit.SlackBuild delete mode 100644 misc/xcb-imdkit/xcb-imdkit.info create mode 100644 multimedia/HandBrake/A08-cmake4.patch delete mode 100644 multimedia/aom/README delete mode 100644 multimedia/aom/aom.SlackBuild delete mode 100644 multimedia/aom/aom.info delete mode 100644 multimedia/aom/slack-desc delete mode 100644 multimedia/avidemux/x265-4.1.diff create mode 100644 multimedia/dvdstyler/ffmpeg-7.patch create mode 100644 multimedia/gpac/ffmpeg7.patch delete mode 100644 multimedia/gst-plugins-bad-nonfree/new_x265.diff delete mode 100644 multimedia/gst-plugins-bad-nonfree/new_zxing.diff create mode 100644 multimedia/haruna/mpv-0.38.patch create mode 100644 multimedia/intel-media-sdk/patches/020-intel-media-sdk-libcttmetrics-static-only.patch create mode 100644 multimedia/intel-media-sdk/patches/030-intel-media-sdk-gcc13-fix.patch create mode 100644 multimedia/intel-media-sdk/patches/040-intel-media-sdk-gcc15-fix.patch create mode 100644 multimedia/kodi/pipewire-1.4.0.patch create mode 100644 multimedia/losslesscut-bin/README create mode 100644 multimedia/losslesscut-bin/doinst.sh create mode 100644 multimedia/losslesscut-bin/losslesscut-bin.SlackBuild create mode 100644 multimedia/losslesscut-bin/losslesscut-bin.info create mode 100644 multimedia/losslesscut-bin/resources/LICENSE create mode 100644 multimedia/losslesscut-bin/resources/icon.svg create mode 100644 multimedia/losslesscut-bin/resources/losslesscut-bin.desktop create mode 100644 multimedia/losslesscut-bin/slack-desc create mode 100644 multimedia/mkvtoolnix/boost_1.89.patch delete mode 100644 multimedia/mpv/README delete mode 100644 multimedia/mpv/doinst.sh delete mode 100644 multimedia/mpv/mpv.SlackBuild delete mode 100644 multimedia/mpv/mpv.info delete mode 100644 multimedia/mpv/slack-desc create mode 100644 multimedia/obs-studio/patches/1_7ed9b1f.patch create mode 100644 multimedia/obs-studio/patches/2_92fc9f6.patch create mode 100644 multimedia/obs-studio/patches/3_ed1e079.patch create mode 100644 multimedia/obs-studio/patches/4_6d0381f.patch create mode 100644 multimedia/obs-studio/patches/5_ffmpeg-7.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-ffmpeg.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-ffmpeg2.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-ffmpeg24.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-ffmpeg29.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-ffmpeg4.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-libav-10.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-libav-9.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-preset-force.patch delete mode 100644 multimedia/transcode/transcode-1.1.7-preset-free.patch create mode 100644 multimedia/vcdimager/libxml214.diff create mode 100644 multimedia/vlc/4645.patch create mode 100644 multimedia/vlc/4665.patch create mode 100644 multimedia/vlc/vlc-3.0.21-fedora_ffmpeg7-1.patch create mode 100644 multimedia/x265/cmake4.patch create mode 100644 multimedia/xvidcore/xvidcore-c23.patch delete mode 100644 network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch create mode 100644 network/MEGAcmd/megacmd-1.7.0_ffmpeg6.patch delete mode 100644 network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch create mode 100644 network/MEGAsync/megasync-4.9.1.0_ffmpeg6.patch delete mode 100644 network/avahi/README delete mode 100644 network/avahi/README.SBo delete mode 100644 network/avahi/avahi.SlackBuild delete mode 100644 network/avahi/avahi.info delete mode 100644 network/avahi/doinst.sh delete mode 100644 network/avahi/man/man1/avahi-bookmarks.1 delete mode 100644 network/avahi/man/man1/avahi-browse.1 delete mode 100644 network/avahi/man/man1/avahi-discover.1 delete mode 100644 network/avahi/man/man1/avahi-publish.1 delete mode 100644 network/avahi/man/man1/avahi-resolve.1 delete mode 100644 network/avahi/man/man1/avahi-set-host-name.1 delete mode 100644 network/avahi/man/man1/bssh.1 delete mode 100644 network/avahi/man/man5/avahi-daemon.conf.5 delete mode 100644 network/avahi/man/man5/avahi.hosts.5 delete mode 100644 network/avahi/man/man5/avahi.service.5 delete mode 100644 network/avahi/man/man8/avahi-daemon.8 delete mode 100644 network/avahi/man/man8/avahi-dnsconfd.8 delete mode 100644 network/avahi/man/man8/avahi-dnsconfd.action.8 delete mode 100644 network/avahi/patches/fixup_avahi-dnsconfd.action.patch delete mode 100644 network/avahi/slack-desc create mode 100644 network/mdk4/patches/01_manpage_example.patch create mode 100644 network/mdk4/patches/02_makefile_osdep_parallel_build_fix.patch create mode 100644 network/mdk4/patches/03_fix-x-mode-bug.patch create mode 100644 network/mdk4/patches/04_Declare-functions-before-using-it.patch create mode 100644 network/mdk4/patches/05_ftbfs-with-gcc-14.patch delete mode 100644 network/mosh/1282.patch delete mode 100644 network/mosh/README delete mode 100644 network/mosh/mosh.SlackBuild delete mode 100644 network/mosh/mosh.info delete mode 100644 network/mosh/slack-desc create mode 100644 network/ngrep/ngrep-1.47-regex.patch create mode 100644 network/sylpheed/sylpheed-3.7.0-types.patch delete mode 100644 network/tokodon/README delete mode 100644 network/tokodon/doinst.sh delete mode 100644 network/tokodon/slack-desc delete mode 100644 network/tokodon/tokodon.SlackBuild delete mode 100644 network/tokodon/tokodon.info create mode 100644 network/urlview/patches/Link-against-libncursesw-setlocale-LC_ALL.patch create mode 100644 network/urlview/patches/invoke-AM_INIT_AUTOMAKE-with-foreign.patch delete mode 100644 network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch create mode 100644 network/wol/patches/wol-0.7.1-Fix-config.h-test-consumption.patch create mode 100644 network/wol/patches/wol-0.7.1-Fix-malloc-detection.patch create mode 100644 network/wol/patches/wol-0.7.1-linux-headers.patch delete mode 100644 network/wsdd2/README delete mode 100644 network/wsdd2/README.allowip6 delete mode 100644 network/wsdd2/doinst.sh delete mode 100644 network/wsdd2/rc.wsdd2 delete mode 100644 network/wsdd2/slack-desc delete mode 100644 network/wsdd2/wsdd2.SlackBuild delete mode 100644 network/wsdd2/wsdd2.info delete mode 100644 network/wsdd2/wsdd2.patch create mode 100644 office/evince/evince-46.3.1-kpathsea-header-files.patch create mode 100644 office/goldendict/ffmpeg7.patch create mode 100644 office/paps/fmt-12.patch create mode 100644 office/paps/glib-2.82.patch create mode 100644 office/scribus/scribus-1.6.4_poppler-25.06.patch create mode 100644 office/scribus/scribus-1.6.4_poppler-25.07.patch create mode 100644 office/scribus/scribus-1.6.4_poppler-25.09.patch create mode 100644 office/xournal/xournal-0.4.8-c99-fix.patch create mode 100644 perl/mod_perl/r1910623.patch delete mode 100644 perl/perl-IO-Tty/README delete mode 100644 perl/perl-IO-Tty/perl-IO-Tty.SlackBuild delete mode 100644 perl/perl-IO-Tty/perl-IO-Tty.info delete mode 100644 perl/perl-IO-Tty/slack-desc create mode 100644 perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-declaration.patch create mode 100644 perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-type.patch create mode 100644 perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.13-recode.patch create mode 100644 perl/perl-tk/patches/01_perl-Tk-widget.patch create mode 100644 perl/perl-tk/patches/02_perl-Tk-debian.patch create mode 100644 perl/perl-tk/patches/03_perl-Tk-seg.patch create mode 100644 perl/perl-tk/patches/04_perl-Tk-c99.patch create mode 100644 perl/perl-tk/patches/05_perl-Tk-Fix-STRLEN-vs-int-pointer-confusion-in-Tcl_GetByteAr.patch create mode 100644 perl/perl-tk/patches/06_perl-Tk-Fix-build-with-clang-16.patch create mode 100644 perl/perl-tk/patches/07_perl-Tk-pregcomp2.c-Avoid-using-incompatible-pointer-type.patch create mode 100644 perl/perl-tk/patches/08_perl-Tk-Avoid-using-incompatible-pointer-type-for-old_warn.patch create mode 100644 perl/perl-tk/patches/09_perl-Tk-Fix-incompatible-pointer-type-in-function-GetTextIndex.patch delete mode 100644 python/alabaster/README delete mode 100644 python/alabaster/alabaster.SlackBuild delete mode 100644 python/alabaster/alabaster.info delete mode 100644 python/alabaster/slack-desc delete mode 100644 python/gi-docgen/README delete mode 100644 python/gi-docgen/gi-docgen.SlackBuild delete mode 100644 python/gi-docgen/gi-docgen.info delete mode 100644 python/gi-docgen/slack-desc delete mode 100644 python/python-importlib_metadata/README delete mode 100644 python/python-importlib_metadata/python-importlib_metadata.SlackBuild delete mode 100644 python/python-importlib_metadata/python-importlib_metadata.info delete mode 100644 python/python-importlib_metadata/slack-desc delete mode 100644 python/python-smartypants/README delete mode 100644 python/python-smartypants/python-smartypants.SlackBuild delete mode 100644 python/python-smartypants/python-smartypants.info delete mode 100644 python/python-smartypants/slack-desc delete mode 100644 python/python-zipp/README delete mode 100644 python/python-zipp/python-zipp.SlackBuild delete mode 100644 python/python-zipp/python-zipp.info delete mode 100644 python/python-zipp/slack-desc create mode 100644 python/python2-six/README create mode 100644 python/python2-six/python2-six.SlackBuild create mode 100644 python/python2-six/python2-six.info create mode 100644 python/python2-six/slack-desc delete mode 100644 python/python3-babel/README delete mode 100644 python/python3-babel/python3-babel.SlackBuild delete mode 100644 python/python3-babel/python3-babel.info delete mode 100644 python/python3-babel/slack-desc delete mode 100644 python/python3-build/README delete mode 100644 python/python3-build/python3-build.SlackBuild delete mode 100644 python/python3-build/python3-build.info delete mode 100644 python/python3-build/slack-desc delete mode 100644 python/python3-calver/README delete mode 100644 python/python3-calver/python3-calver.SlackBuild delete mode 100644 python/python3-calver/python3-calver.info delete mode 100644 python/python3-calver/slack-desc delete mode 100644 python/python3-dnspython/README delete mode 100644 python/python3-dnspython/python3-dnspython.SlackBuild delete mode 100644 python/python3-dnspython/python3-dnspython.info delete mode 100644 python/python3-dnspython/slack-desc delete mode 100644 python/python3-editables/README delete mode 100644 python/python3-editables/python3-editables.SlackBuild delete mode 100644 python/python3-editables/python3-editables.info delete mode 100644 python/python3-editables/slack-desc delete mode 100644 python/python3-exceptiongroup/README delete mode 100644 python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild delete mode 100644 python/python3-exceptiongroup/python3-exceptiongroup.info delete mode 100644 python/python3-exceptiongroup/slack-desc delete mode 100644 python/python3-flit_core/README delete mode 100644 python/python3-flit_core/python3-flit_core.SlackBuild delete mode 100644 python/python3-flit_core/python3-flit_core.info delete mode 100644 python/python3-flit_core/slack-desc delete mode 100644 python/python3-glad/README delete mode 100644 python/python3-glad/python3-glad.SlackBuild delete mode 100644 python/python3-glad/python3-glad.info delete mode 100644 python/python3-glad/slack-desc delete mode 100644 python/python3-hatch_vcs/README delete mode 100644 python/python3-hatch_vcs/python3-hatch_vcs.SlackBuild delete mode 100644 python/python3-hatch_vcs/python3-hatch_vcs.info delete mode 100644 python/python3-hatch_vcs/slack-desc delete mode 100644 python/python3-hatchling/README delete mode 100644 python/python3-hatchling/python3-hatchling.SlackBuild delete mode 100644 python/python3-hatchling/python3-hatchling.info delete mode 100644 python/python3-hatchling/slack-desc delete mode 100644 python/python3-installer/README delete mode 100644 python/python3-installer/python3-installer.SlackBuild delete mode 100644 python/python3-installer/python3-installer.info delete mode 100644 python/python3-installer/slack-desc delete mode 100644 python/python3-lxml/README delete mode 100644 python/python3-lxml/python3-lxml.SlackBuild delete mode 100644 python/python3-lxml/python3-lxml.info delete mode 100644 python/python3-lxml/slack-desc delete mode 100644 python/python3-meson-opt/README delete mode 100644 python/python3-meson-opt/python3-meson-opt.SlackBuild delete mode 100644 python/python3-meson-opt/python3-meson-opt.info delete mode 100644 python/python3-meson-opt/slack-desc delete mode 100644 python/python3-mesonpy/README delete mode 100644 python/python3-mesonpy/python3-mesonpy.SlackBuild delete mode 100644 python/python3-mesonpy/python3-mesonpy.info delete mode 100644 python/python3-mesonpy/slack-desc create mode 100644 python/python3-opencv/no-ADE-download-4.10.0.84.diff delete mode 100644 python/python3-opencv/no-ADE-download.diff delete mode 100644 python/python3-opencv/sync_with_sci-build-4.5.5.64.diff delete mode 100644 python/python3-packaging-opt/README delete mode 100644 python/python3-packaging-opt/python3-packaging-opt.SlackBuild delete mode 100644 python/python3-packaging-opt/python3-packaging-opt.info delete mode 100644 python/python3-packaging-opt/slack-desc delete mode 100644 python/python3-pathspec/README delete mode 100644 python/python3-pathspec/python3-pathspec.SlackBuild delete mode 100644 python/python3-pathspec/python3-pathspec.info delete mode 100644 python/python3-pathspec/slack-desc delete mode 100644 python/python3-pluggy/README delete mode 100644 python/python3-pluggy/python3-pluggy.SlackBuild delete mode 100644 python/python3-pluggy/python3-pluggy.info delete mode 100644 python/python3-pluggy/slack-desc delete mode 100644 python/python3-psutil/README delete mode 100644 python/python3-psutil/python3-psutil.SlackBuild delete mode 100644 python/python3-psutil/python3-psutil.info delete mode 100644 python/python3-psutil/slack-desc delete mode 100644 python/python3-pyproject-hooks/README delete mode 100644 python/python3-pyproject-hooks/python3-pyproject-hooks.SlackBuild delete mode 100644 python/python3-pyproject-hooks/python3-pyproject-hooks.info delete mode 100644 python/python3-pyproject-hooks/slack-desc delete mode 100644 python/python3-pyproject-metadata/README delete mode 100644 python/python3-pyproject-metadata/python3-pyproject-metadata.SlackBuild delete mode 100644 python/python3-pyproject-metadata/python3-pyproject-metadata.info delete mode 100644 python/python3-pyproject-metadata/slack-desc delete mode 100644 python/python3-setuptools-opt/README delete mode 100644 python/python3-setuptools-opt/python3-setuptools-opt.SlackBuild delete mode 100644 python/python3-setuptools-opt/python3-setuptools-opt.info delete mode 100644 python/python3-setuptools-opt/setuptools.x86_64.diff.gz delete mode 100644 python/python3-setuptools-opt/slack-desc delete mode 100644 python/python3-setuptools-scm-opt/README delete mode 100644 python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild delete mode 100644 python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info delete mode 100644 python/python3-setuptools-scm-opt/slack-desc delete mode 100644 python/python3-setuptools_scm_git_archive/README delete mode 100644 python/python3-setuptools_scm_git_archive/python3-setuptools_scm_git_archive.SlackBuild delete mode 100644 python/python3-setuptools_scm_git_archive/python3-setuptools_scm_git_archive.info delete mode 100644 python/python3-setuptools_scm_git_archive/slack-desc delete mode 100644 python/python3-tomli-opt/README delete mode 100644 python/python3-tomli-opt/python3-tomli-opt.SlackBuild delete mode 100644 python/python3-tomli-opt/python3-tomli-opt.info delete mode 100644 python/python3-tomli-opt/slack-desc delete mode 100644 python/python3-tomli_w/README delete mode 100644 python/python3-tomli_w/python3-tomli_w.SlackBuild delete mode 100644 python/python3-tomli_w/python3-tomli_w.info delete mode 100644 python/python3-tomli_w/slack-desc delete mode 100644 python/python3-trove-classifiers/README delete mode 100644 python/python3-trove-classifiers/python3-trove-classifiers.SlackBuild delete mode 100644 python/python3-trove-classifiers/python3-trove-classifiers.info delete mode 100644 python/python3-trove-classifiers/slack-desc delete mode 100644 python/python3-typogrify/README delete mode 100644 python/python3-typogrify/python3-typogrify.SlackBuild delete mode 100644 python/python3-typogrify/python3-typogrify.info delete mode 100644 python/python3-typogrify/slack-desc delete mode 100644 python/python3-versioneer/README delete mode 100644 python/python3-versioneer/python3-versioneer.SlackBuild delete mode 100644 python/python3-versioneer/python3-versioneer.info delete mode 100644 python/python3-versioneer/slack-desc delete mode 100644 python/python3-webencodings/README delete mode 100644 python/python3-webencodings/python3-webencodings.SlackBuild delete mode 100644 python/python3-webencodings/python3-webencodings.info delete mode 100644 python/python3-webencodings/slack-desc delete mode 100644 python/python3-wheel/README delete mode 100644 python/python3-wheel/python3-wheel.SlackBuild delete mode 100644 python/python3-wheel/python3-wheel.info delete mode 100644 python/python3-wheel/slack-desc delete mode 100644 python/sphinx-rtd-theme/README delete mode 100644 python/sphinx-rtd-theme/slack-desc delete mode 100644 python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild delete mode 100644 python/sphinx-rtd-theme/sphinx-rtd-theme.info delete mode 100644 python/sphinxcontrib-applehelp/README delete mode 100644 python/sphinxcontrib-applehelp/slack-desc delete mode 100644 python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild delete mode 100644 python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info delete mode 100644 python/sphinxcontrib-devhelp/README delete mode 100644 python/sphinxcontrib-devhelp/slack-desc delete mode 100644 python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild delete mode 100644 python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info delete mode 100644 python/sphinxcontrib-htmlhelp/README delete mode 100644 python/sphinxcontrib-htmlhelp/slack-desc delete mode 100644 python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild delete mode 100644 python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info delete mode 100644 python/sphinxcontrib-jsmath/README delete mode 100644 python/sphinxcontrib-jsmath/slack-desc delete mode 100644 python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.SlackBuild delete mode 100644 python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.info delete mode 100644 python/sphinxcontrib-qthelp/README delete mode 100644 python/sphinxcontrib-qthelp/slack-desc delete mode 100644 python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild delete mode 100644 python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info delete mode 100644 python/sphinxcontrib-serializinghtml/README delete mode 100644 python/sphinxcontrib-serializinghtml/slack-desc delete mode 100644 python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild delete mode 100644 python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info delete mode 100644 system/adobe-source-code-pro-font/README delete mode 100644 system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild delete mode 100644 system/adobe-source-code-pro-font/adobe-source-code-pro-font.info delete mode 100644 system/adobe-source-code-pro-font/doinst.sh delete mode 100644 system/adobe-source-code-pro-font/slack-desc delete mode 100644 system/aterm/README delete mode 100644 system/aterm/aterm.SlackBuild delete mode 100644 system/aterm/aterm.info delete mode 100644 system/aterm/patches/01-display-security-issue.diff delete mode 100644 system/aterm/patches/02-deadkeys.diff delete mode 100644 system/aterm/patches/03-dpy.diff delete mode 100644 system/aterm/patches/05-configure-clang16.diff delete mode 100644 system/aterm/slack-desc delete mode 100644 system/ccid/README delete mode 100644 system/ccid/ccid.SlackBuild delete mode 100644 system/ccid/ccid.info delete mode 100644 system/ccid/slack-desc delete mode 100644 system/cnijfilter2/gcc10.patch create mode 100644 system/cnijfilter2/patches/add-missing-import.patch create mode 100644 system/cnijfilter2/patches/fix-libxml2-config.patch create mode 100644 system/cnijfilter2/patches/gcc15-fix.patch create mode 100644 system/cowsql/conflicting-types.patch create mode 100644 system/d-feet/data_meson_build.patch create mode 100644 system/evhz/gcc15.patch delete mode 100644 system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch create mode 100644 system/fakechroot/patches/104.patch create mode 100644 system/fakechroot/patches/80.patch create mode 100644 system/fakechroot/patches/autoupdate.patch create mode 100644 system/fakechroot/patches/b42d1fb9538f680af2f31e864c555414ccba842a.patch create mode 100644 system/fakechroot/patches/disable_cp.t.patch create mode 100644 system/fakechroot/patches/fix_test_on_32bits.patch create mode 100644 system/freeipmi/patches/c23.patch rename system/freeipmi/{ => patches}/header.patch (100%) rename system/freeipmi/{ => patches}/include.patch (100%) rename system/freeipmi/{ => patches}/prototype.patch (100%) create mode 100644 system/gnome-disk-utility/66.patch delete mode 100644 system/gnome-vfs/openssl-1.1.patch create mode 100644 system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch create mode 100644 system/gnome-vfs/patches/gnome-vfs2-c99.patch create mode 100644 system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch create mode 100644 system/gnome-vfs/patches/openssl-1.1.patch create mode 100644 system/heirloom-sh/heirloom-sh-glibc-2.34.patch delete mode 100644 system/ipmitool/patches/0001-CVE-2011-4339-OpenIPMI.patch delete mode 100644 system/ipmitool/patches/0002-openssl.patch delete mode 100644 system/ipmitool/patches/0003-ipmitool-1.8.11-set-kg-key.patch delete mode 100644 system/ipmitool/patches/0004-slowswid.patch delete mode 100644 system/ipmitool/patches/0005-sensor-id-length.patch delete mode 100644 system/ipmitool/patches/0006-enable-usb.patch delete mode 100644 system/ipmitool/patches/0007-check-input.patch delete mode 100644 system/ipmitool/patches/0008-add-extern.patch delete mode 100644 system/ipmitool/patches/0009-best-cipher.patch delete mode 100644 system/ipmitool/patches/0010-pef-missing-newline.patch delete mode 100644 system/ipmitool/patches/0011-expand-sensor-name-column.patch delete mode 100644 system/ipmitool/patches/0012-CVE-2020-5208.patch delete mode 100644 system/jq/README delete mode 100644 system/jq/jq.SlackBuild delete mode 100644 system/jq/jq.info delete mode 100644 system/jq/slack-desc delete mode 100644 system/ktsuss/README delete mode 100644 system/ktsuss/ktsuss.SlackBuild delete mode 100644 system/ktsuss/ktsuss.info delete mode 100644 system/ktsuss/slack-desc delete mode 100644 system/noto-emoji/README delete mode 100644 system/noto-emoji/doinst.sh delete mode 100644 system/noto-emoji/noto-emoji.SlackBuild delete mode 100644 system/noto-emoji/noto-emoji.info delete mode 100644 system/noto-emoji/slack-desc delete mode 100644 system/nut/README delete mode 100644 system/nut/README.SLACKWARE delete mode 100644 system/nut/doinst.sh delete mode 100644 system/nut/nut.SlackBuild delete mode 100644 system/nut/nut.info delete mode 100644 system/nut/nut_kill_inverter delete mode 100644 system/nut/nut_restart_udev delete mode 100644 system/nut/rc.ups delete mode 100644 system/nut/slack-desc create mode 100644 system/open-vm-tools/751.patch delete mode 100644 system/opensc/README delete mode 100644 system/opensc/doinst.sh delete mode 100644 system/opensc/opensc.SlackBuild delete mode 100644 system/opensc/opensc.info delete mode 100644 system/opensc/slack-desc create mode 100644 system/pcem/x86-build.diff.gz delete mode 100644 system/pcsc-lite/README delete mode 100644 system/pcsc-lite/README.SLACKWARE delete mode 100644 system/pcsc-lite/doinst.sh delete mode 100644 system/pcsc-lite/pcsc-lite.SlackBuild delete mode 100644 system/pcsc-lite/pcsc-lite.info delete mode 100644 system/pcsc-lite/rc.pcscd delete mode 100644 system/pcsc-lite/slack-desc create mode 100644 system/polyglotman/gcc14.patch create mode 100644 system/qemu/qemu-10.0.3-pip-25.2-compat.patch create mode 100644 system/qt-sudo/README create mode 100644 system/qt-sudo/qt-sudo.SlackBuild create mode 100644 system/qt-sudo/qt-sudo.info create mode 100644 system/qt-sudo/slack-desc delete mode 100644 system/scdoc/README delete mode 100644 system/scdoc/scdoc.SlackBuild delete mode 100644 system/scdoc/scdoc.info delete mode 100644 system/scdoc/slack-desc create mode 100644 system/schedtool/schedtool-1.3.0-c99.patch create mode 100644 system/seahorse/patches/GnuPG-2.4.patch create mode 100644 system/seahorse/patches/avoid_C99_incompatibility_around_seahorse_pkcs11_backend_initialize.patch create mode 100644 system/seahorse/patches/refactor_ssh_key_parsing.patch create mode 100644 system/seahorse/patches/seahorse-ssh-return-type.patch create mode 100644 system/spacefm/patches/gcc10.patch create mode 100644 system/spacefm/patches/glibc-2.28.patch create mode 100644 system/spacefm/patches/spacefm-1.0.6-c23-bool-keyword.patch create mode 100644 system/spacefm/patches/spacefm-1.0.6-c23-function-proto.patch create mode 100644 system/spacefm/patches/spacefm-1.0.6-c99-type-cast.patch delete mode 100644 system/stow/README delete mode 100644 system/stow/slack-desc delete mode 100644 system/stow/stow.SlackBuild delete mode 100644 system/stow/stow.info create mode 100644 system/veracrypt/32bit.patch create mode 100644 system/vinterm/includes.diff create mode 100644 system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch create mode 100644 system/virtiofsd/README create mode 100644 system/virtiofsd/slack-desc create mode 100644 system/virtiofsd/virtiofsd.SlackBuild create mode 100644 system/virtiofsd/virtiofsd.info create mode 100644 system/virtualbox-addons/gcc13.patch create mode 100644 system/virtualbox-kernel/kernel-6.9.patch delete mode 100644 system/wayland-utils/README delete mode 100644 system/wayland-utils/slack-desc delete mode 100644 system/wayland-utils/wayland-utils.SlackBuild delete mode 100644 system/wayland-utils/wayland-utils.info delete mode 100644 system/xboxdrv-linux/fix-60-sec-delay.patch delete mode 100644 system/xboxdrv-linux/scons-py3.patch delete mode 100644 system/xboxdrv-linux/scons-v4.2.0.patch delete mode 100644 system/xboxdrv-linux/xboxdrvctl-py3.patch diff --git a/README b/README index b82837404b..e86a93e34c 100644 --- a/README +++ b/README @@ -1,3 +1,19 @@ +SBo-git - slackbuilds repository for slackware-current +- - - + +this is an unofficial fork of master branch from slackbuilds.org's +git repository (http://slackbuilds.org/cgit/slackbuilds/). + +here I put my unofficial mods to their slackbuilds to run on +slackware-current with sbopkg (http://www.sbopkg.org). + +Check https://github.com/Ponce/slackbuilds/wiki for additional informations. + +See https://github.com/Ponce/slackbuilds/wiki/configuring-the-current-repository-with-sbopkg +for instructions on how to use this repository with sbopkg. + +original README from slackbuilds.org follows: +--------------------------------------------- See https://slackbuilds.org/howto/ for instructions on how to use the contents of this directory. diff --git a/academic/EMBASSY/EMBASSY.SlackBuild b/academic/EMBASSY/EMBASSY.SlackBuild index 337de5f778..198554a4f3 100644 --- a/academic/EMBASSY/EMBASSY.SlackBuild +++ b/academic/EMBASSY/EMBASSY.SlackBuild @@ -295,6 +295,9 @@ make install DESTDIR=$PKG # Build MSE cd $TMP/$PRGNAM-$VERSION/$MSE +# Use sed to fix the ncurses issue in mse.c +sed -i 's/Display->_maxx/COLS/' src/mse.c || exit 1 +sed -i 's/Display->_maxy/LINES/' src/mse.c || exit 1 CFLAGS="$SLKCFLAGS $LIBDIRPATH" \ CXXFLAGS="$SLKCFLAGS $LIBDIRPATH" \ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}/EMBOSS" \ diff --git a/academic/WordNet/WordNet.SlackBuild b/academic/WordNet/WordNet.SlackBuild index 2ea227a8db..d888364768 100644 --- a/academic/WordNet/WordNet.SlackBuild +++ b/academic/WordNet/WordNet.SlackBuild @@ -104,7 +104,7 @@ CXXFLAGS="$SLKCFLAGS" \ --datadir=/usr/share/wordnet \ --build=$ARCH-slackware-linux -make CFLAGS="$CFLAGS -DUSE_INTERP_RESULT" +make CFLAGS="$CFLAGS -DUSE_INTERP_RESULT -std=c89" make install-strip DESTDIR=$PKG gzip -9 $PKG/usr/man/man*/* diff --git a/academic/bedtools/bedtools.SlackBuild b/academic/bedtools/bedtools.SlackBuild index 78b678111f..19307cc286 100644 --- a/academic/bedtools/bedtools.SlackBuild +++ b/academic/bedtools/bedtools.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bedtools DIRNAM=bedtools2 -VERSION=${VERSION:-2.31.0} +VERSION=${VERSION:-2.31.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/bedtools/bedtools.info b/academic/bedtools/bedtools.info index 31f2e1b4da..ceec5617fd 100644 --- a/academic/bedtools/bedtools.info +++ b/academic/bedtools/bedtools.info @@ -1,8 +1,8 @@ PRGNAM="bedtools" -VERSION="2.31.0" +VERSION="2.31.1" HOMEPAGE="http://bedtools.readthedocs.org/" -DOWNLOAD="https://github.com/arq5x/bedtools2/releases/download/v2.31.0/bedtools-2.31.0.tar.gz" -MD5SUM="d840193968e345947b076eaa322a9420" +DOWNLOAD="https://github.com/arq5x/bedtools2/releases/download/v2.31.1/bedtools-2.31.1.tar.gz" +MD5SUM="d1eb463c07c0753a4ee3af614b2ae387" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/cutadapt/cutadapt.SlackBuild b/academic/cutadapt/cutadapt.SlackBuild index eb103094cd..83f072bc8d 100644 --- a/academic/cutadapt/cutadapt.SlackBuild +++ b/academic/cutadapt/cutadapt.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cutadapt -VERSION=${VERSION:-1.14} +VERSION=${VERSION:-4.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -85,7 +85,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 CHANGES.rst CITATION LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/academic/cutadapt/cutadapt.info b/academic/cutadapt/cutadapt.info index 9feb6e2217..227845b459 100644 --- a/academic/cutadapt/cutadapt.info +++ b/academic/cutadapt/cutadapt.info @@ -1,8 +1,8 @@ PRGNAM="cutadapt" -VERSION="1.14" +VERSION="4.9" HOMEPAGE="https://pypi.python.org/pypi/cutadapt/" -DOWNLOAD="https://pypi.python.org/packages/16/e3/06b45eea35359833e7c6fac824b604f1551c2fc7ba0f2bd318d8dd883eb9/cutadapt-1.14.tar.gz" -MD5SUM="57403c3794aa940699df3032a5e9b208" +DOWNLOAD="https://files.pythonhosted.org/packages/cb/15/85799e7fa1dfb86b8f79f8f98902b28003a054c46447a0580f21e535dbf3/cutadapt-4.9.tar.gz" +MD5SUM="8642bd2807ab04cb6207e6c72f595a6d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="xopen" diff --git a/academic/flexbar/flexbar.SlackBuild b/academic/flexbar/flexbar.SlackBuild index 803163e046..480f968e4f 100644 --- a/academic/flexbar/flexbar.SlackBuild +++ b/academic/flexbar/flexbar.SlackBuild @@ -88,6 +88,7 @@ cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/academic/geda-gaf/geda-gaf.SlackBuild b/academic/geda-gaf/geda-gaf.SlackBuild index 0feae7e775..181b1ebe62 100644 --- a/academic/geda-gaf/geda-gaf.SlackBuild +++ b/academic/geda-gaf/geda-gaf.SlackBuild @@ -76,6 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ + --without-libfam \ --disable-update-xdg-database make diff --git a/academic/glpk/glpk.SlackBuild b/academic/glpk/glpk.SlackBuild index 8c63ea3f9e..2f20292f49 100644 --- a/academic/glpk/glpk.SlackBuild +++ b/academic/glpk/glpk.SlackBuild @@ -81,7 +81,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 -ansi" \ LDFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/academic/labplot2/README b/academic/labplot2/README deleted file mode 100644 index 11b9ca7430..0000000000 --- a/academic/labplot2/README +++ /dev/null @@ -1,23 +0,0 @@ -labplot2 (interactive graphing and analysis of scientific data) - -LabPlot is a KDE-application for interactive graphing and analysis of -scientific data. - -LabPlot provides an easy way to create, manage and edit plots. It -allows you to produce plots based on data from a spreadsheet or on -data imported from external files. Plots can be exported to several -pixmap and vector graphic formats. - -LabPlot2 is a complete rewrite of LabPlot1 and lacks in the first -release a lot of features available in the predecessor. On the other -hand, the GUI and the usability is more superior as compared to -LabPlot1 and there are several new features that were not available -in LabPlot1. - -optional dependencies: - -- hdf5 -- netcdf -- cfitsio -- matio -- discount diff --git a/academic/labplot2/doinst.sh b/academic/labplot2/doinst.sh deleted file mode 100644 index 4f83cde390..0000000000 --- a/academic/labplot2/doinst.sh +++ /dev/null @@ -1,14 +0,0 @@ - -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/academic/labplot2/labplot2.SlackBuild b/academic/labplot2/labplot2.SlackBuild deleted file mode 100644 index 6a491ce176..0000000000 --- a/academic/labplot2/labplot2.SlackBuild +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash -# -# Slackware build script for LabPlot -# Based on the Slackware 15.0 SlackBuild and AUR PKGBUILD for labplot -# -# Copyright 2014-2024, Fellype do Nascimento, Guaratingueta - 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. - -cd $(dirname $0) ; CWD=$(pwd) -NAME=labplot - -PRGNAM=labplot2 -VERSION=${VERSION:-2.11.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $NAME-$VERSION -tar -xJf $CWD/$NAME-$VERSION.tar.xz -cd $NAME-$VERSION - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -( cd build/ -cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DMAN_INSTALL_DIR=/usr/man \ - -DENABLE_READSTAT=OFF \ - -DENABLE_TESTS=OFF \ - -DLOCAL_DBC_PARSER=OFF \ - -DLOCAL_VECTOR_BLF=OFF \ - .. -make -make install/strip DESTDIR=$PKG -) - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# no usr/share/doc dir -mkdir -p $PKG/usr/doc -mv $PKG/usr/share/doc/* $PKG/usr/doc -rmdir $PKG/usr/share/doc - -# Leave only one main category in key "Categories" for the .desktop file -sed -i "s:Qt;KDE;Education;Science;Physics;Math;:Science;:" $PKG/usr/share/applications/org.kde.labplot2.desktop - -# Fix permissions in .desktop file -chmod 0644 $PKG/usr/share/applications/org.kde.labplot2.desktop - -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 README.md LICENSES/* \ -$PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE - diff --git a/academic/labplot2/labplot2.info b/academic/labplot2/labplot2.info deleted file mode 100644 index bb85132dc6..0000000000 --- a/academic/labplot2/labplot2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="labplot2" -VERSION="2.11.1" -HOMEPAGE="https://labplot.kde.org/" -DOWNLOAD="https://download.kde.org/stable/labplot/labplot-2.11.1.tar.xz" -MD5SUM="5113391e0eb304974238becfa82c0a70" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Fellype do Nascimento" -EMAIL="fellype (at) gmail (dot) com" diff --git a/academic/labplot2/slack-desc b/academic/labplot2/slack-desc deleted file mode 100644 index 7bd9341d2e..0000000000 --- a/academic/labplot2/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -labplot2: labplot2 (interactive graphing and analysis of scientific data) -labplot2: -labplot2: LabPlot is a KDE-application for interactive graphing and analysis of -labplot2: scientific data. LabPlot provides an easy way to create, manage and -labplot2: edit plots. -labplot2: LabPlot2 is a complete rewrite of LabPlot1 and lacks in the first -labplot2: release a lot of features available in the predecessor. On the other -labplot2: hand, the GUI and the usability is more superior as compared to -labplot2: LabPlot1 and there are several new features that were not available -labplot2: in LabPlot1. -labplot2: diff --git a/academic/metis/metis.SlackBuild b/academic/metis/metis.SlackBuild index a7f2a4926e..6c59148545 100644 --- a/academic/metis/metis.SlackBuild +++ b/academic/metis/metis.SlackBuild @@ -100,6 +100,7 @@ cd build -DCMAKE_SKIP_RPATH=YES \ -DCMAKE_RULE_MESSAGES=OFF \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DOPENMP=ON \ .. make install/strip DESTDIR=$PKG diff --git a/academic/python3-scipy/python3-scipy.SlackBuild b/academic/python3-scipy/python3-scipy.SlackBuild index 7bf9576df1..765d7ff546 100644 --- a/academic/python3-scipy/python3-scipy.SlackBuild +++ b/academic/python3-scipy/python3-scipy.SlackBuild @@ -34,7 +34,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="python3-scipy" SRCNAM="scipy" -VERSION=${VERSION:-1.12.0} +VERSION=${VERSION:-1.15.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,15 +72,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# Allow our version of numpy and pythran to work -sed -i 's|numpy==1.22.4|numpy>=1.22.4|' pyproject.toml -sed -i 's|numpy==1.23.2|numpy>=1.23.2|' pyproject.toml -sed -i 's|pythran>=0.15.0,<0.16.0|pythran|' pyproject.toml -sed -i 's|meson-python>=0.15.0,<0.16.0|meson-python>=0.15.0|' pyproject.toml - -# needs newer meson -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages/ +# Cython in current is too new +sed -i "s|3\.1\.0\"|3.2.0\"|" pyproject.toml python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl diff --git a/academic/python3-scipy/python3-scipy.info b/academic/python3-scipy/python3-scipy.info index b2043cced7..19438c6af2 100644 --- a/academic/python3-scipy/python3-scipy.info +++ b/academic/python3-scipy/python3-scipy.info @@ -1,8 +1,8 @@ PRGNAM="python3-scipy" -VERSION="1.12.0" +VERSION="1.15.3" HOMEPAGE="https://www.scipy.org/" -DOWNLOAD="https://github.com/scipy/scipy/releases/download/v1.12.0/scipy-1.12.0.tar.gz" -MD5SUM="22683fcf9a411f0a5254b7509bea0a6b" +DOWNLOAD="https://github.com/scipy/scipy/releases/download/v1.15.3/scipy-1.15.3.tar.gz" +MD5SUM="8959dabb9bf7b10075eecd08b708e573" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pybind11 python3-pythran OpenBLAS" diff --git a/academic/qalculate-gtk/README b/academic/qalculate-gtk/README deleted file mode 100644 index dc7e6fb53e..0000000000 --- a/academic/qalculate-gtk/README +++ /dev/null @@ -1,10 +0,0 @@ -qalculate-gtk (GTK interface to libqalculate) - -Qalculate! is a multi-purpose cross-platform desktop calculator. It is -simple to use but provides power and versatility normally reserved for -complicated math packages, as well as useful tools for everyday needs -(such as currency conversion and percent calculation). Features include -a large library of customizable functions, unit calculations and -conversion, symbolic calculations (including integers and equations), -arbitrary precision, uncertainty propagation, interval arithmetic, -plotting and a user-friendly interface. diff --git a/academic/qalculate-gtk/doinst.sh b/academic/qalculate-gtk/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/academic/qalculate-gtk/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/academic/qalculate-gtk/qalculate-gtk.SlackBuild b/academic/qalculate-gtk/qalculate-gtk.SlackBuild deleted file mode 100644 index aaabd631f4..0000000000 --- a/academic/qalculate-gtk/qalculate-gtk.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash - -# Slackware build script for qalculate-gtk - -# Copyright 2016-2020 Larry Hajali -# Copyright 2024 K. Eugene Carlson Tsukuba, Japan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=qalculate-gtk -VERSION=${VERSION:-3.22.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 {} \; - -OSNAME="$(awk -F= '/^ID=/{print $2}' /etc/os-release)" - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --mandir=/usr/man \ - --libdir=/usr/lib$LIBDIRSUFFIX \ - --disable-silent-rules \ - --build=$ARCH-$OSNAME-linux - -make -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -cp -a AUTHORS ChangeLog COPYING NEWS README $PKG/usr/doc/$PRGNAM-$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 diff --git a/academic/qalculate-gtk/qalculate-gtk.info b/academic/qalculate-gtk/qalculate-gtk.info deleted file mode 100644 index 742abf9f78..0000000000 --- a/academic/qalculate-gtk/qalculate-gtk.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="qalculate-gtk" -VERSION="3.22.0" -HOMEPAGE="https://qalculate.github.io/" -DOWNLOAD="https://github.com/Qalculate/qalculate-gtk/releases/download/v3.22.0/qalculate-gtk-3.22.0.tar.gz" -MD5SUM="856b04752c5f7157797c4548d5ad73ef" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="K. Eugene Carlson" -EMAIL="kvngncrlsn@gmail.com" diff --git a/academic/qalculate-gtk/slack-desc b/academic/qalculate-gtk/slack-desc deleted file mode 100644 index bb2ea4c545..0000000000 --- a/academic/qalculate-gtk/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -qalculate-gtk: qalculate-gtk (GTK interface to libqalculate) -qalculate-gtk: -qalculate-gtk: Qalculate! is a multi-purpose cross-platform desktop calculator. -qalculate-gtk: -qalculate-gtk: Homepage: https://qalculate.github.io/ -qalculate-gtk: -qalculate-gtk: -qalculate-gtk: -qalculate-gtk: -qalculate-gtk: -qalculate-gtk: diff --git a/academic/speedcrunch/speedcrunch.SlackBuild b/academic/speedcrunch/speedcrunch.SlackBuild index 813dc8292d..1dd484159c 100644 --- a/academic/speedcrunch/speedcrunch.SlackBuild +++ b/academic/speedcrunch/speedcrunch.SlackBuild @@ -88,6 +88,7 @@ cmake -G "Unix Makefiles" \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=RELEASE \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ src make VERBOSE=1 diff --git a/academic/staden/staden.SlackBuild b/academic/staden/staden.SlackBuild index 4c16f47019..cca4bfe29c 100644 --- a/academic/staden/staden.SlackBuild +++ b/academic/staden/staden.SlackBuild @@ -81,6 +81,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 '11i #include ' stops/stops.c + # Make sure libraries path is correct. sed -i "s:$STADENROOT/lib:$STADENROOT/lib${LIBDIRSUFFIX}:g" \ global.mk staden.profile diff --git a/academic/stellarium/stellarium.SlackBuild b/academic/stellarium/stellarium.SlackBuild index fa3ce9900c..18b68389b1 100644 --- a/academic/stellarium/stellarium.SlackBuild +++ b/academic/stellarium/stellarium.SlackBuild @@ -122,6 +122,7 @@ cd build -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DPREFER_SYSTEM_INDILIB=NO \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/academic/stellarsolver/README b/academic/stellarsolver/README deleted file mode 100644 index d643734df5..0000000000 --- a/academic/stellarsolver/README +++ /dev/null @@ -1,17 +0,0 @@ -stellarsolver Astrometric Plate Solver - -stellarsolver is a cross platform SEP-based star extractor and -astrometry.net-based internal astrometric solver. Also refered to as -Plate solving or Astrometric calibration of an astronomical image, -this is a technique used in astronomy and applied on celestial images. -the astrometric solution it is possible to calculate the celestial -coordinates of any object on the image or synchronize the telescope -mount or satellite pointing position to the center of the image taken. - -stellarsolver is required to compile Kstars with INDI support. - -For initial QT6 support, try - -QT6=yes ./stellarsolver.SlackBuild - -NOTE: Kstars still requires QT5 support. diff --git a/academic/stellarsolver/doinst.sh b/academic/stellarsolver/doinst.sh deleted file mode 100644 index 19b813d022..0000000000 --- a/academic/stellarsolver/doinst.sh +++ /dev/null @@ -1,7 +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 - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 -fi diff --git a/academic/stellarsolver/slack-desc b/academic/stellarsolver/slack-desc deleted file mode 100644 index c56b7376e3..0000000000 --- a/academic/stellarsolver/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -stellarsolver: stellarsolver (Astrometric Plate Solver) -stellarsolver: -stellarsolver: stellarsolver is a cross platform SEP-based star extractor and -stellarsolver: astrometry.net-based internal astrometric solver. -stellarsolver: -stellarsolver: -stellarsolver: -stellarsolver: https://github.com/rlancaste/stellarsolver -stellarsolver: -stellarsolver: -stellarsolver: diff --git a/academic/stellarsolver/stellarsolver.SlackBuild b/academic/stellarsolver/stellarsolver.SlackBuild deleted file mode 100644 index 6e2e31d671..0000000000 --- a/academic/stellarsolver/stellarsolver.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# Slackware build script for stellarsolver - -# Copyright 2022 Edward W. Koenig, Vancouver, WA, 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=stellarsolver -VERSION=${VERSION:-2.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -case "$ARCH" in - x86_64) ;; - arm*) ;; - *) echo "Unsupported ARCH '$ARCH'"; exit 1 ;; -esac - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 {} \; - -if [ "QT6=${QT6:-no}" = "yes" ]; then - USEQT6="-DUSE_QT5=no" -else - USEQT6="" -fi - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -mkdir -p build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - $USEQT6 \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTER=ON .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/academic/stellarsolver/stellarsolver.info b/academic/stellarsolver/stellarsolver.info deleted file mode 100644 index 82311bf651..0000000000 --- a/academic/stellarsolver/stellarsolver.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="stellarsolver" -VERSION="2.6" -HOMEPAGE="https://github.com/rlancaste/stellarsolver" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://github.com/rlancaste/stellarsolver/archive/2.6/stellarsolver-2.6.tar.gz" -MD5SUM_x86_64="f01db3dfcbab439b1b09d78f4833b1a6" -REQUIRES="wcslib" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@linuxgalaxy.org" diff --git a/academic/suitesparse/README b/academic/suitesparse/README deleted file mode 100644 index 4704b3906b..0000000000 --- a/academic/suitesparse/README +++ /dev/null @@ -1,31 +0,0 @@ -suitesparse is a collection of libraries for computations involving -sparse matrices. The package includes the following libraries: - -AMD: approximate minimum degree ordering. -CAMD: constrained approximate minimum degree ordering. -COLAMD: column approximate minimum degree ordering. -CCOLAMD: constrained column approximate minimum degree ordering. -CHOLMOD: sparse Cholesky factorization. -CXSparse: CSparse extended: complex matrix, int and long int support. -KLU & BTF: sparse LU factorization, primarily for circuit simulation. -LDL: a simple LDL^t factorization. -SQPR: a multithread, multifrontal, rank-revealing sparse QR - factorization method. -UMFPACK: sparse LU factorization. -RBio: read/write files in Rutherford/Boeing format. -GraphBLAS: graph algorithms in the language of linear algebra -Mongoose: graph partitioning -ssget: MATLAB and Java interface to the SuiteSparse Matrix Collection - -Suitesparse is an optional dependency for the octave package. - -CXSparse is a superset of CSparse, and the two share common header -names, so it does not make sense to build both. CXSparse is built -by default. - -SlackBuilds.org also has all the parts of this suite as individual -builds - DO NOT try and install the individual parts and the suite; -choose one or the other. - -For Slackware 15.0, suitesparse's version is being held at 5.13.0. -Later versions are not compatible with 15.0 supplied version of cmake. diff --git a/academic/suitesparse/slack-desc b/academic/suitesparse/slack-desc deleted file mode 100644 index 657aa8db4a..0000000000 --- a/academic/suitesparse/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -suitesparse: suitesparse (A collection of sparse matrix libraries) -suitesparse: -suitesparse: suitesparse is a collection of libraries for computations involving -suitesparse: sparse matrices. The package includes the following libraries: -suitesparse: AMD, BTF, CAMD, COLAMD, CCOLAMD, CHOLMOD, CXSparse, KLU, LDL, -suitesparse: SQPR, UMFPACK, GraphBLAS, Mongoose. -suitesparse: -suitesparse: -suitesparse: -suitesparse: -suitesparse: diff --git a/academic/suitesparse/suitesparse.SlackBuild b/academic/suitesparse/suitesparse.SlackBuild deleted file mode 100644 index 774fbc1a19..0000000000 --- a/academic/suitesparse/suitesparse.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash - -# Slackware build script for suitesparse - -# Copyright 2017-2023 Christoph Willing, Brisbane Australia -# All rights reserved. -# Thanks to Pablo Santamaria for previous versions -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=suitesparse -SRCNAM=SuiteSparse -VERSION=${VERSION:-5.13.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p $PKG/usr/include/suitesparse -mkdir -p $PKG/usr/lib$LIBDIRSUFFIX -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION - -export BLAS="$(pkg-config --libs openblas)" -make -make install \ - INSTALL_INCLUDE=$PKG/usr/include/suitesparse \ - INSTALL_LIB=$PKG/usr/lib$LIBDIRSUFFIX \ - INSTALL_DOC=$PKG/usr/doc/$PRGNAM-$VERSION - -# Check that each library already has an rpath before attempting to modify it -# (libmetis.so does not, causing `chrpath --replace` to fail) -for l in $PKG/usr/lib${LIBDIRSUFFIX}/* -do - if chrpath -l $l ; then - chrpath --replace /usr/lib$LIBDIRSUFFIX $l - fi -done - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -cp -a LICENSE.txt CONTRIBUTOR-LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/academic/suitesparse/suitesparse.info b/academic/suitesparse/suitesparse.info deleted file mode 100644 index 929ec6e26f..0000000000 --- a/academic/suitesparse/suitesparse.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="suitesparse" -VERSION="5.13.0" -HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html" -DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.13.0/SuiteSparse-5.13.0.tar.gz" -MD5SUM="e9e7bc594b77ae4b58d943cdc286d679" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="lapack OpenBLAS chrpath" -MAINTAINER="Christoph Willing" -EMAIL="chris.willing@linux.com" diff --git a/academic/sundials/sundials.SlackBuild b/academic/sundials/sundials.SlackBuild index 3fb0a5fab5..f06e49e4a1 100644 --- a/academic/sundials/sundials.SlackBuild +++ b/academic/sundials/sundials.SlackBuild @@ -92,7 +92,7 @@ sed -i \ src/*/CMakeLists.txt \ src/*/*/CMakeLists.txt -export PATH=/opt/cmake-202x/bin:$PATH +export CMAKE_POLICY_VERSION_MINIMUM=3.5 mkdir -p build cd build diff --git a/academic/veusz/veusz.SlackBuild b/academic/veusz/veusz.SlackBuild index 0687b9c384..2e621465f8 100644 --- a/academic/veusz/veusz.SlackBuild +++ b/academic/veusz/veusz.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=veusz -VERSION=${VERSION:-3.3.1} +VERSION=${VERSION:-3.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -87,7 +84,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING INSTALL README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS ChangeLog COPYING INSTALL.md README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cp Documents/manual/pdf/veusz.pdf $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/academic/veusz/veusz.info b/academic/veusz/veusz.info index 4b02fb8b23..f65ba238b2 100644 --- a/academic/veusz/veusz.info +++ b/academic/veusz/veusz.info @@ -1,8 +1,8 @@ PRGNAM="veusz" -VERSION="3.3.1" +VERSION="3.6.2" HOMEPAGE="https://veusz.github.io/" -DOWNLOAD="https://github.com/veusz/veusz/releases/download/veusz-3.3.1/veusz-3.3.1.tar.gz" -MD5SUM="1c7d42d6f87ea3b98fafc8dc52dbbc58" +DOWNLOAD="https://github.com/veusz/veusz/releases/download/veusz-3.6.2/veusz-3.6.2.tar.gz" +MD5SUM="5f79427f7d704437bb984e23393f838f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-numpy" diff --git a/accessibility/flite/flite.SlackBuild b/accessibility/flite/flite.SlackBuild index ee743fdacc..da0382f814 100644 --- a/accessibility/flite/flite.SlackBuild +++ b/accessibility/flite/flite.SlackBuild @@ -144,6 +144,7 @@ done # "cd -", as they don't nest. ( cd doc # build the HTML docs. + sed -i -e "s|html/flite\ |html/flite_html |" -e "s|html/flite\;|html/flite_html;|" -e "s|html/flite/|html/flite_html/|" Makefile make $PRGNAM.html ( cd html diff --git a/accessibility/ydotool/ydotool.SlackBuild b/accessibility/ydotool/ydotool.SlackBuild index b7f612be94..7e63eca55d 100644 --- a/accessibility/ydotool/ydotool.SlackBuild +++ b/accessibility/ydotool/ydotool.SlackBuild @@ -93,6 +93,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install/strip DESTDIR=$PKG diff --git a/audio/SuperCollider/SuperCollider.SlackBuild b/audio/SuperCollider/SuperCollider.SlackBuild index 3aca95ac5c..26ce3bd336 100644 --- a/audio/SuperCollider/SuperCollider.SlackBuild +++ b/audio/SuperCollider/SuperCollider.SlackBuild @@ -60,6 +60,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/supercollider-3.12.2-libsndfile-110-compat.patch + # Pass AVAHI=yes to the script to enable avahi support if [ "${AVAHI:-no}" = "yes" ]; then avahi="OFF"; else avahi="ON"; fi diff --git a/audio/SuperCollider/supercollider-3.12.2-libsndfile-110-compat.patch b/audio/SuperCollider/supercollider-3.12.2-libsndfile-110-compat.patch new file mode 100644 index 0000000000..321789c2d8 --- /dev/null +++ b/audio/SuperCollider/supercollider-3.12.2-libsndfile-110-compat.patch @@ -0,0 +1,237 @@ +From b9dd70c4c8d61c93d7a70645e0bd18fa76e6834e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcin=20P=C4=85czkowski?= +Date: Mon, 18 Apr 2022 13:51:53 -0700 +Subject: [PATCH 1/2] libsndfile: use a macro instead of redefining the struct + +Co-Authored-By: Christof Ressi +--- + include/plugin_interface/SC_SndBuf.h | 4 +-- + server/plugins/DiskIO_UGens.cpp | 29 +++++++++++---------- + server/scsynth/SC_HiddenWorld.h | 4 +++ + server/scsynth/SC_SequencedCommand.cpp | 10 +++---- + server/scsynth/SC_World.cpp | 4 +-- + server/supernova/sc/sc_plugin_interface.cpp | 4 +-- + 6 files changed, 30 insertions(+), 25 deletions(-) + +diff --git a/include/plugin_interface/SC_SndBuf.h b/include/plugin_interface/SC_SndBuf.h +index daccfef8438..2cc129edbf9 100644 +--- a/include/plugin_interface/SC_SndBuf.h ++++ b/include/plugin_interface/SC_SndBuf.h +@@ -22,7 +22,7 @@ + + #include + +-typedef struct SNDFILE_tag SNDFILE; ++#define GETSNDFILE(x) ((SNDFILE*)x->sndfile) + + #ifdef SUPERNOVA + +@@ -145,7 +145,7 @@ struct SndBuf { + int mask; // for delay lines + int mask1; // for interpolating oscillators. + int coord; // used by fft ugens +- SNDFILE* sndfile; // used by disk i/o ++ void* sndfile; // used by disk i/o + // SF_INFO fileinfo; // used by disk i/o + #ifdef SUPERNOVA + bool isLocal; +diff --git a/server/plugins/DiskIO_UGens.cpp b/server/plugins/DiskIO_UGens.cpp +index 825d2d52ab3..3ace3ca8ffe 100644 +--- a/server/plugins/DiskIO_UGens.cpp ++++ b/server/plugins/DiskIO_UGens.cpp +@@ -111,7 +111,7 @@ void DiskIOMsg::Perform() { + sf_count_t count; + switch (mCommand) { + case kDiskCmd_Read: +- count = buf->sndfile ? sf_readf_float(buf->sndfile, buf->data + mPos * buf->channels, mFrames) : 0; ++ count = buf->sndfile ? sf_readf_float(GETSNDFILE(buf), buf->data + mPos * buf->channels, mFrames) : 0; + if (count < mFrames) { + memset(buf->data + (mPos + count) * buf->channels, 0, (mFrames - count) * buf->channels * sizeof(float)); + World_GetBuf(mWorld, mBufNum)->mask = mPos + count; +@@ -126,17 +126,17 @@ void DiskIOMsg::Perform() { + memset(buf->data + mPos * buf->channels, 0, mFrames * buf->channels * sizeof(float)); + goto leave; + } +- count = sf_readf_float(buf->sndfile, buf->data + mPos * buf->channels, mFrames); ++ count = sf_readf_float(GETSNDFILE(buf), buf->data + mPos * buf->channels, mFrames); + while (mFrames -= count) { +- sf_seek(buf->sndfile, 0, SEEK_SET); +- count = sf_readf_float(buf->sndfile, buf->data + (mPos + count) * buf->channels, mFrames); ++ sf_seek(GETSNDFILE(buf), 0, SEEK_SET); ++ count = sf_readf_float(GETSNDFILE(buf), buf->data + (mPos + count) * buf->channels, mFrames); + } + break; + case kDiskCmd_Write: + // printf("kDiskCmd_Write %d %p\n", mBufNum, buf->sndfile); + if (!buf->sndfile) + goto leave; +- count = sf_writef_float(buf->sndfile, buf->data + mPos * buf->channels, mFrames); ++ count = sf_writef_float(GETSNDFILE(buf), buf->data + mPos * buf->channels, mFrames); + break; + } + +@@ -287,14 +287,14 @@ void DiskIn_next(DiskIn* unit, int inNumSamples) { + if ((int)ZIN0(1)) { // loop + if (!bufr->sndfile) + memset(bufr->data + mPos * bufr->channels, 0, bufFrames2 * bufr->channels * sizeof(float)); +- count = sf_readf_float(bufr->sndfile, bufr->data + mPos * bufr->channels, bufFrames2); ++ count = sf_readf_float(GETSNDFILE(bufr), bufr->data + mPos * bufr->channels, bufFrames2); + while (bufFrames2 -= count) { +- sf_seek(bufr->sndfile, 0, SEEK_SET); +- count = sf_readf_float(bufr->sndfile, bufr->data + (mPos + count) * bufr->channels, bufFrames2); ++ sf_seek(GETSNDFILE(bufr), 0, SEEK_SET); ++ count = sf_readf_float(GETSNDFILE(bufr), bufr->data + (mPos + count) * bufr->channels, bufFrames2); + } + } else { // non-loop +- count = +- bufr->sndfile ? sf_readf_float(bufr->sndfile, bufr->data + mPos * bufr->channels, bufFrames2) : 0; ++ count = bufr->sndfile ? sf_readf_float(GETSNDFILE(bufr), bufr->data + mPos * bufr->channels, bufFrames2) ++ : 0; + if (count < bufFrames2) { + memset(bufr->data + (mPos + count) * bufr->channels, 0, + (bufFrames2 - count) * bufr->channels * sizeof(float)); +@@ -469,13 +469,14 @@ static void VDiskIn_request_buffer(VDiskIn* unit, float fbufnum, uint32 bufFrame + if ((int)ZIN0(2)) { // loop + if (!bufr->sndfile) + memset(bufr->data + mPos * bufr->channels, 0, bufFrames2 * bufr->channels * sizeof(float)); +- count = sf_readf_float(bufr->sndfile, bufr->data + mPos * bufr->channels, bufFrames2); ++ count = sf_readf_float(GETSNDFILE(bufr), bufr->data + mPos * bufr->channels, bufFrames2); + while (bufFrames2 -= count) { +- sf_seek(bufr->sndfile, 0, SEEK_SET); +- count = sf_readf_float(bufr->sndfile, bufr->data + (mPos + count) * bufr->channels, bufFrames2); ++ sf_seek(GETSNDFILE(bufr), 0, SEEK_SET); ++ count = sf_readf_float(GETSNDFILE(bufr), bufr->data + (mPos + count) * bufr->channels, bufFrames2); + } + } else { // non-loop +- count = bufr->sndfile ? sf_readf_float(bufr->sndfile, bufr->data + mPos * bufr->channels, bufFrames2) : 0; ++ count = ++ bufr->sndfile ? sf_readf_float(GETSNDFILE(bufr), bufr->data + mPos * bufr->channels, bufFrames2) : 0; + if (count < bufFrames2) { + memset(bufr->data + (mPos + count) * bufr->channels, 0, + (bufFrames2 - count) * bufr->channels * sizeof(float)); +diff --git a/server/scsynth/SC_HiddenWorld.h b/server/scsynth/SC_HiddenWorld.h +index 1782ae8e5c4..1f1d924e83d 100644 +--- a/server/scsynth/SC_HiddenWorld.h ++++ b/server/scsynth/SC_HiddenWorld.h +@@ -37,6 +37,10 @@ + + #include "../../common/server_shm.hpp" + ++#ifndef NO_LIBSNDFILE ++# include ++#endif ++ + extern HashTable* gUnitDefLib; + + +diff --git a/server/scsynth/SC_SequencedCommand.cpp b/server/scsynth/SC_SequencedCommand.cpp +index 4227355f3e9..6f54e87a5e4 100644 +--- a/server/scsynth/SC_SequencedCommand.cpp ++++ b/server/scsynth/SC_SequencedCommand.cpp +@@ -375,7 +375,7 @@ bool BufFreeCmd::Stage2() { + mFreeData = buf->data; + #ifndef NO_LIBSNDFILE + if (buf->sndfile) +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + #endif + SndBuf_Init(buf); + return true; +@@ -600,7 +600,7 @@ bool BufReadCmd::Stage2() { + } + + if (buf->sndfile) +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + + if (mLeaveFileOpen) { + buf->sndfile = sf; +@@ -903,7 +903,7 @@ bool BufReadChannelCmd::Stage2() { + + leave: + if (buf->sndfile) +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + + if (mLeaveFileOpen) { + buf->sndfile = sf; +@@ -1014,7 +1014,7 @@ bool BufWriteCmd::Stage2() { + } + + if (buf->sndfile) +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + + if (mLeaveFileOpen) { + buf->sndfile = sf; +@@ -1057,7 +1057,7 @@ bool BufCloseCmd::Stage2() { + #else + SndBuf* buf = World_GetNRTBuf(mWorld, mBufIndex); + if (buf->sndfile) { +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + buf->sndfile = nullptr; + } + return true; +diff --git a/server/scsynth/SC_World.cpp b/server/scsynth/SC_World.cpp +index e6ee49023b2..e3de39e4ce2 100644 +--- a/server/scsynth/SC_World.cpp ++++ b/server/scsynth/SC_World.cpp +@@ -968,9 +968,9 @@ void World_Cleanup(World* world, bool unload_plugins) { + + #ifndef NO_LIBSNDFILE + if (nrtbuf->sndfile) +- sf_close(nrtbuf->sndfile); ++ sf_close(GETSNDFILE(nrtbuf)); + if (rtbuf->sndfile && rtbuf->sndfile != nrtbuf->sndfile) +- sf_close(rtbuf->sndfile); ++ sf_close(GETSNDFILE(rtbuf)); + #endif + } + +diff --git a/server/supernova/sc/sc_plugin_interface.cpp b/server/supernova/sc/sc_plugin_interface.cpp +index 0ca778730b4..2a938600a4d 100644 +--- a/server/supernova/sc/sc_plugin_interface.cpp ++++ b/server/supernova/sc/sc_plugin_interface.cpp +@@ -1041,7 +1041,7 @@ void sc_plugin_interface::buffer_close(uint32_t index) { + + if (buf->sndfile == nullptr) + return; +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + buf->sndfile = nullptr; + } + +@@ -1070,7 +1070,7 @@ void sc_plugin_interface::buffer_sync(uint32_t index) noexcept { + void sc_plugin_interface::free_buffer(uint32_t index) { + SndBuf* buf = world.mSndBufsNonRealTimeMirror + index; + if (buf->sndfile) +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + + sndbuf_init(buf); + } + +From e93a0c81ca7afdeb69f1aaf5d6167be7e8097f39 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcin=20P=C4=85czkowski?= +Date: Mon, 18 Apr 2022 16:07:18 -0700 +Subject: [PATCH 2/2] libsndfile: add windows prototypes on additional sndfile + include + +--- + server/scsynth/SC_HiddenWorld.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server/scsynth/SC_HiddenWorld.h b/server/scsynth/SC_HiddenWorld.h +index 1f1d924e83d..57a26147eb3 100644 +--- a/server/scsynth/SC_HiddenWorld.h ++++ b/server/scsynth/SC_HiddenWorld.h +@@ -38,7 +38,7 @@ + #include "../../common/server_shm.hpp" + + #ifndef NO_LIBSNDFILE +-# include ++# include // includes sndfile.h with appropriate configuration + #endif + + extern HashTable* gUnitDefLib; diff --git a/audio/TiMidity++/TiMidity++.SlackBuild b/audio/TiMidity++/TiMidity++.SlackBuild index 3c2002f203..a97dde8330 100644 --- a/audio/TiMidity++/TiMidity++.SlackBuild +++ b/audio/TiMidity++/TiMidity++.SlackBuild @@ -108,7 +108,7 @@ done # Required for --docdir autoreconf -vif -EXTRACFLAGS="$SLKCFLAGS" \ +EXTRACFLAGS="$SLKCFLAGS -std=gnu11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/apulse/apulse.SlackBuild b/audio/apulse/apulse.SlackBuild index 1e13b61aa3..8febd740c5 100644 --- a/audio/apulse/apulse.SlackBuild +++ b/audio/apulse/apulse.SlackBuild @@ -81,6 +81,7 @@ buildit() { mkdir -p build cd build cmake \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DAPULSEPATH=/usr/lib$2${AP_SUBDIR} \ -DAPULSE_SEARCH_PATHS=/usr/lib${AP_SUBDIR}:/usr/lib${LIBDIRSUFFIX}${AP_SUBDIR} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/audio/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild index a6c2e21fe1..73fb2674f0 100644 --- a/audio/audacity/audacity.SlackBuild +++ b/audio/audacity/audacity.SlackBuild @@ -105,11 +105,11 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DAUDACITY_BUILD_LEVEL=2 \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -std=gnu17" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=gnu17" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DHAVE_VISIBILITY=1" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DHAVE_VISIBILITY=1" \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_MANDIR=/usr/man \ diff --git a/audio/clementine/clementine.SlackBuild b/audio/clementine/clementine.SlackBuild index 1efd341829..3eded4ce3a 100644 --- a/audio/clementine/clementine.SlackBuild +++ b/audio/clementine/clementine.SlackBuild @@ -76,6 +76,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +export CMAKE_POLICY_VERSION_MINIMUM=3.10 +patch -p1 < $CWD/cmake4.patch + # Prevent forced git revision detection patch -p1 < $CWD/make-git-rev-detection-optional.patch sed -i 's|INCLUDE_GIT_REVISION ON|INCLUDE_GIT_REVISION OFF|' cmake/Version.cmake @@ -93,6 +96,7 @@ cd build -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -Wno-dev \ .. make make install DESTDIR=$PKG diff --git a/audio/clementine/cmake4.patch b/audio/clementine/cmake4.patch new file mode 100644 index 0000000000..86cabe7bec --- /dev/null +++ b/audio/clementine/cmake4.patch @@ -0,0 +1,32 @@ +April 11th 2025 - Matteo Bernardini +Fix building with cmake >= 4.x + +diff -Naur Clementine-1.4.1.orig/3rdparty/libprojectm/CMakeLists.txt Clementine-1.4.1/3rdparty/libprojectm/CMakeLists.txt +--- Clementine-1.4.1.orig/3rdparty/libprojectm/CMakeLists.txt 2024-10-10 04:42:33.000000000 +0200 ++++ Clementine-1.4.1/3rdparty/libprojectm/CMakeLists.txt 2025-04-11 17:57:22.555230000 +0200 +@@ -4,11 +4,11 @@ + + include(CheckCXXCompilerFlag) + +-cmake_policy(SET CMP0005 OLD) ++cmake_policy(SET CMP0005 NEW) + + # This policy was only added in cmake 2.8.4 + if (CMAKE_VERSION VERSION_GREATER "2.8.3") +- cmake_policy(SET CMP0017 OLD) ++ cmake_policy(SET CMP0017 NEW) + endif (CMAKE_VERSION VERSION_GREATER "2.8.3") + + +diff -Naur Clementine-1.4.1.orig/CMakeLists.txt Clementine-1.4.1/CMakeLists.txt +--- Clementine-1.4.1.orig/CMakeLists.txt 2024-10-10 04:42:33.000000000 +0200 ++++ Clementine-1.4.1/CMakeLists.txt 2025-04-11 17:59:11.152230000 +0200 +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0.0) + project(clementine) + +-cmake_policy(SET CMP0053 OLD) ++cmake_policy(SET CMP0053 NEW) + + include(CheckCXXCompilerFlag) + include(FindPkgConfig) diff --git a/audio/flac-opt/README b/audio/flac-opt/README deleted file mode 100644 index 193e83f09e..0000000000 --- a/audio/flac-opt/README +++ /dev/null @@ -1,39 +0,0 @@ -flac-opt (free lossless audio codec) - -flac is open source software that can reduce the amount of storage -space needed to store digital audio signals without needing to remove -information in doing so. This version of flac is newer than the one -included in Slackware, and is installed in /opt/flac-opt so it won't -conflict with Slackware's flac package. - -The main reason for using this is that this newer version of flac -supports multithreaded encoding (via the -j option), which speeds up -the process dramatically. Even without using -j, encodes about 25% -faster than Slackware's flac. - -Decoding speed is the same (and can't use multiple threads), so -recompiling e.g. media player apps to use this version of flac doesn't -make sense. - -After the package is installed, either log out & back in, or run -"source /etc/profile.d/flac-opt.sh" to put the new flac and metaflac -commands in your PATH. flac-opt.sh is installed +x by default. - -SlackBuild developers: if you're writing a SlackBuild that needs the -flac libraries in this package, put this somewhere near the top of -your build script (after the "set -e"): - - source /etc/profile.d/flac-opt-dev.sh - -The -dev file is not installed executable, to avoid conflicting with -the standard flac libraries. It can also be sourced in an interactive -shell, if needed, but DO NOT "chmod +x" this file. - -By default, flac-opt is built with assembly language optimizations. If -you get "illegal instruction" errors at runtime, rebuild the package -with ASM=no in the environment. This should only happen on elderly -(first-generation) x86_64 hardware, such as the original Athlon64. - -By default, flac-opt is built with upstream's default C optimization, -which is -O3. There's no reason this should bother anyone... but if it -does, you can built with FORCE_O2=yes in the environment. diff --git a/audio/flac-opt/flac-opt-dev.sh b/audio/flac-opt/flac-opt-dev.sh deleted file mode 100644 index 7aed33a78b..0000000000 --- a/audio/flac-opt/flac-opt-dev.sh +++ /dev/null @@ -1,15 +0,0 @@ -# profile.d script for SBo flac-opt build, WTFPL, B. Watson. - -# Note: DO NOT chmod +x this file. It exists to be sourced only when -# actually needed, and can cause problems when not needed. - -Ptmp=@LIBDIR@/pkgconfig - -if [ -z "$PKG_CONFIG_PATH" ]; then - PKG_CONFIG_PATH="$Ptmp" -else - PKG_CONFIG_PATH="$Ptmp:$PKG_CONFIG_PATH" -fi - -export PKG_CONFIG_PATH -unset Ptmp diff --git a/audio/flac-opt/flac-opt.SlackBuild b/audio/flac-opt/flac-opt.SlackBuild deleted file mode 100644 index 4f5ec56233..0000000000 --- a/audio/flac-opt/flac-opt.SlackBuild +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/bash - -# Slackware build script for flac-opt - -# Written by B. Watson (urchlay@slackware.uk) - -# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -# 20250512 bkw: BUILD=2 -# - fix man breakage that occurred if MANPATH wasn't already set -# when the profile script ran. Thanks to fourtysixandtwo for -# catching this. - -# Notes: -# - Not based on PV's flac.SlackBuild. Started with SBo template. -# - Static libraries, not shared, because they live in a weird prefix. -# - It's possible to export PREFIX=/whatever, but not documented in README -# because I really don't expect anyone to do this. -# - I include the API docs and examples even though PV leaves them -# out of his flac package. -# - Encoding really is about 25% faster than Slackware's older flac, even if -# you don't use the new -j option to run in parallel. With -j8 on my 8-core -# workstation, it's 4-5x as fast as the old flac. -# - It's possible to build with either autoconf or cmake. I tried both, -# didn't see any difference. Went with autoconf because it's more -# familiar. May change in the future, if upstream drops autoconf. -# - I see no advantage to building with -O2 rather than upstream's -# default -O3, but I added an option to use -O2 if you're that -# fanatical about using default CFLAGS. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=flac-opt -SRCNAM=flac -VERSION=${VERSION:-1.5.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" -o "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="" - LIBDIRSUFFIX="" -fi - -# upstream uses -O3, we'll go with that unless the user insists. -COPT=-O3 -[ "${FORCE_O2:-no}" = "yes" ] && COPT=-O2 -SLKCFLAGS="$COPT $SLKCFLAGS" - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod -h 755 {} + -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod -h 644 {} + - -if [ "${ASM:-yes}" = "no" ]; then - ASMOPT=disable - WITHASM="WITHOUT" -else - ASMOPT=enable - WITHASM="WITH" -fi - -PREFIX=${PREFIX:-/opt/$PRGNAM} -DOCDIR=/usr/doc/$PRGNAM-$VERSION -PKGDOC=$PKG/$DOCDIR -LIBDIR=$PREFIX/lib$LIBDIRSUFFIX - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --disable-examples \ - --disable-werror \ - --$ASMOPT-asm-optimizations \ - --prefix=$PREFIX \ - --libdir=$LIBDIR \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=$PREFIX/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-shared \ - --enable-static \ - --build=$ARCH-slackware-linux - -make V=1 -make install-strip DESTDIR=$PKG -rm -f $PKG/$PREFIX/lib*/*.la -gzip -9 $PKG/$PREFIX/man/man*/* - -PROF=$PKG/etc/profile.d -mkdir -p $PROF -for i in flac-opt.sh flac-opt-dev.sh; do - sed -e "s,@PREFIX@,$PREFIX,g" -e "s,@LIBDIR@,$LIBDIR,g" $CWD/$i > $PROF/$i -done -chmod 755 $PROF/flac-opt.sh - -# pkgconfig needs a bit of help. we do this so callers don't have to -# specify --static as a pkg-config option. -sed -i -e '/^Libs\.private/d' \ - -e '/^Libs:/s,$, -logg -lm,' \ - $PKG/$LIBDIR/pkgconfig/flac.pc - -# we didn't build the examples, but include their source in the doc dir. -mkdir -p $PKGDOC -cp -a examples/ AUTHORS *.md COPYING* $PKGDOC -cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -sed -e "s,@WITHASM@,$WITHASM," \ - -e "s,@PREFIX@,$PREFIX," \ - -e "s,@SLKCFLAGS@,$SLKCFLAGS," \ - $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/audio/flac-opt/flac-opt.info b/audio/flac-opt/flac-opt.info deleted file mode 100644 index 1042e4e18f..0000000000 --- a/audio/flac-opt/flac-opt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="flac-opt" -VERSION="1.5.0" -HOMEPAGE="https://github.com/xiph/flac/" -DOWNLOAD="https://github.com/xiph/flac/releases/download/1.5.0/flac-1.5.0.tar.xz" -MD5SUM="0bb45bcf74338b00efeec121fff27367" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/audio/flac-opt/flac-opt.sh b/audio/flac-opt/flac-opt.sh deleted file mode 100644 index eb9a6dad59..0000000000 --- a/audio/flac-opt/flac-opt.sh +++ /dev/null @@ -1,7 +0,0 @@ -# profile.d script for SBo flac-opt build, WTFPL, B. Watson. - -MANPATH="@PREFIX@/man:$MANPATH" -PATH=@PREFIX@/bin:$PATH - -export PATH -export MANPATH diff --git a/audio/flac-opt/slack-desc b/audio/flac-opt/slack-desc deleted file mode 100644 index b182464253..0000000000 --- a/audio/flac-opt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -flac-opt: flac-opt (free lossless audio codec) -flac-opt: -flac-opt: flac is open source software that can reduce the amount of storage -flac-opt: space needed to store digital audio signals without needing to remove -flac-opt: information in doing so. This version of flac is newer than the one -flac-opt: included in Slackware, and is installed in /opt so it won't conflict -flac-opt: with Slackware's flac package. -flac-opt: -flac-opt: This package built @WITHASM@ assembly optimizations. -flac-opt: C flags: @SLKCFLAGS@. Install prefix: @PREFIX@ -flac-opt: diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild index 3861745771..72ec8ba9c2 100644 --- a/audio/guitarix/guitarix.SlackBuild +++ b/audio/guitarix/guitarix.SlackBuild @@ -90,6 +90,8 @@ if [ "${LV2:-yes}" = "no" ]; then LV2OPT=--no-lv2 fi +for i in $CWD/patches/*; do patch -p2 < $i ; done + # grrr, -DNDEBUG doesn't get added to the flags automatically... LIBDIR="/usr/lib${LIBDIRSUFFIX}" ./waf configure \ diff --git a/audio/guitarix/patches/always_inline.patch b/audio/guitarix/patches/always_inline.patch new file mode 100644 index 0000000000..940649f11c --- /dev/null +++ b/audio/guitarix/patches/always_inline.patch @@ -0,0 +1,22 @@ +diff --git a/trunk/src/ladspa/ladspa_guitarix.cpp b/trunk/src/ladspa/ladspa_guitarix.cpp +index 1fccffb3..85c3a766 100644 +--- a/trunk/src/ladspa/ladspa_guitarix.cpp ++++ b/trunk/src/ladspa/ladspa_guitarix.cpp +@@ -16,8 +16,6 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#define always_inline inline __attribute__((always_inline)) +- + #include + #include + #include +@@ -34,6 +32,8 @@ + #include "gx_faust_plugins.h" + #include "../plugins/pluginlib.h" + ++#define always_inline inline __attribute__((always_inline)) ++ + #include "faust/gx_ampout_ladspa.cc" + #include "faust/gx_outputlevel_ladspa.cc" + diff --git a/audio/guitarix/patches/gcc-13.patch b/audio/guitarix/patches/gcc-13.patch new file mode 100644 index 0000000000..90681810b1 --- /dev/null +++ b/audio/guitarix/patches/gcc-13.patch @@ -0,0 +1,12 @@ +diff --git a/trunk/src/LV2/DSP/gx_common.h b/trunk/src/LV2/DSP/gx_common.h +index 71108442..ea230e34 100644 +--- a/trunk/src/LV2/DSP/gx_common.h ++++ b/trunk/src/LV2/DSP/gx_common.h +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + ///////////////////////// DENORMAL PROTECTION WITH SSE ///////////////// + diff --git a/audio/hydrogen/hydrogen.SlackBuild b/audio/hydrogen/hydrogen.SlackBuild index b5cc339108..dbf4a5c60e 100644 --- a/audio/hydrogen/hydrogen.SlackBuild +++ b/audio/hydrogen/hydrogen.SlackBuild @@ -91,6 +91,7 @@ cd build -DWANT_PORTMIDI=ON \ -DWANT_RUBBERBAND=ON \ -DLADSPA_LIBRARIES=/usr/lib$LIBDIRSUFIX/ladspa \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/audio/jack-rack/jack-rack.SlackBuild b/audio/jack-rack/jack-rack.SlackBuild index ae6c058b15..4452e382e1 100644 --- a/audio/jack-rack/jack-rack.SlackBuild +++ b/audio/jack-rack/jack-rack.SlackBuild @@ -72,7 +72,7 @@ fi # --docdir not supported LDFLAGS="-lm -ldl" \ -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu17 -Wno-implicit-function-declaration" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/audio/jack/jack.SlackBuild b/audio/jack/jack.SlackBuild index 30fde24f08..dcacc0e765 100644 --- a/audio/jack/jack.SlackBuild +++ b/audio/jack/jack.SlackBuild @@ -97,6 +97,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +patch -p1 < $CWD/jack2_1.9.22_update_to_waf_2.0.26.patch + # Minor source of incompatibility between jack 1.x and 2.x: some jack # apps don't add -lpthread to their CFLAGS because they assume jack.pc # will already include it (it does, in 1.x). So make 2 act like 1: diff --git a/audio/jack/jack.info b/audio/jack/jack.info index 9567dbac3f..8d5f329b99 100644 --- a/audio/jack/jack.info +++ b/audio/jack/jack.info @@ -2,9 +2,11 @@ PRGNAM="jack" VERSION="1.9.22" HOMEPAGE="http://jackaudio.org/" DOWNLOAD="https://github.com/jackaudio/jack2/archive/v1.9.22/jack2-1.9.22.tar.gz \ - https://github.com/jackaudio/jack-example-tools/archive/4/jack-example-tools-4.tar.gz" + https://github.com/jackaudio/jack-example-tools/archive/4/jack-example-tools-4.tar.gz \ + https://ponce.cc/slackware/sources/repo/jack2_1.9.22_update_to_waf_2.0.26.patch" MD5SUM="e57c8ad3de75f78b6eb7aacea4e25755 \ - 282f4c913489b32edc9926c8f84a73ae" + 282f4c913489b32edc9926c8f84a73ae \ + 7ba0b85ffedc67e8c850e463076bd28e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/audio/jack_capture/gcc14.patch b/audio/jack_capture/gcc14.patch new file mode 100644 index 0000000000..7bbc01e9ba --- /dev/null +++ b/audio/jack_capture/gcc14.patch @@ -0,0 +1,39 @@ +--- a/jack_capture.c 2017-05-19 05:56:00.000000000 -0500 ++++ b/jack_capture.c 2025-04-05 23:16:46.219938571 -0500 +@@ -909,6 +909,7 @@ + #define vsnprintf _vsnprintf + #endif + #ifndef __APPLE__ ++#ifndef HAVE_ASPRINTF + int asprintf(char **buffer, char *fmt, ...) { + /* Guess we need no more than 200 chars of space. */ + int size = 200; +@@ -947,6 +948,7 @@ + } + #endif + #endif ++#endif + + #define ARGS_ADD_ARGV(FMT,ARG) \ + argv=(char**) realloc((void*)argv, (argc+2)*sizeof(char*)); \ +--- a/gen_das_config_h.sh 2017-05-19 05:56:00.000000000 -0500 ++++ b/gen_das_config_h.sh 2025-04-05 23:47:40.843411772 -0500 +@@ -54,6 +54,18 @@ + echo "#define NEW_JACK_LATENCY_API 0" + fi + ++echo "#include " >temp$$.c ++echo "int main() {" >>temp$$.c ++echo " char *buf;" >>temp$$.c ++echo " asprintf(&buf, "test %d", 42);" >>temp$$.c ++echo " return 0;" >>temp$$.c ++echo "}" >>temp$$.c ++ ++if gcc temp$$.c 2>/dev/null; then ++ echo "#define HAVE_ASPRINTF 1" ++else ++ echo "#define HAVE_ASPRINTF 0" ++fi + + rm temp$$.c + diff --git a/audio/jack_capture/jack_capture.SlackBuild b/audio/jack_capture/jack_capture.SlackBuild index 2ddca8a915..27bbd0bc83 100644 --- a/audio/jack_capture/jack_capture.SlackBuild +++ b/audio/jack_capture/jack_capture.SlackBuild @@ -83,6 +83,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/gcc14.patch + sed -i -e "s/OPTIMIZE=-O3.*/OPTIMIZE=${SLKCFLAGS}/g" Makefile make diff --git a/audio/libebur128/libebur128.SlackBuild b/audio/libebur128/libebur128.SlackBuild index dd72599f6a..2ff96b1fe8 100644 --- a/audio/libebur128/libebur128.SlackBuild +++ b/audio/libebur128/libebur128.SlackBuild @@ -74,6 +74,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_STATIC_LIBS=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/audio/mpd/mpd.SlackBuild b/audio/mpd/mpd.SlackBuild index 0509453430..f656f59d70 100644 --- a/audio/mpd/mpd.SlackBuild +++ b/audio/mpd/mpd.SlackBuild @@ -42,7 +42,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mpd -VERSION=${VERSION:-0.23.16} +VERSION=${VERSION:-0.23.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -97,15 +97,17 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +# LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -lnsl" \ cd build CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ - LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -lnsl" \ + CPPFLAGS="-I/usr/include/yajl" \ meson .. \ -Dsystemd=disabled \ -Dpulse=$PULSE \ -Dupnp=disabled \ -Dmikmod=disabled \ + -Dsndio=disabled \ --buildtype=release \ --infodir=/usr/info \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/mpd/mpd.info b/audio/mpd/mpd.info index b1f6a350d9..4b63d5430f 100644 --- a/audio/mpd/mpd.info +++ b/audio/mpd/mpd.info @@ -1,10 +1,10 @@ PRGNAM="mpd" -VERSION="0.23.16" +VERSION="0.23.17" HOMEPAGE="https://www.musicpd.org/" -DOWNLOAD="http://www.musicpd.org/download/mpd/0.23/mpd-0.23.16.tar.xz" -MD5SUM="12cf077f7d1563ff95604734d45e941a" +DOWNLOAD="http://www.musicpd.org/download/mpd/0.23/mpd-0.23.17.tar.xz" +MD5SUM="4182e740600c233b308dddfddb379fc3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="fmt" +REQUIRES="yajl" MAINTAINER="DhabyX" EMAIL="slack.dhabyx@gmail.com" diff --git a/audio/mppenc/mppenc.SlackBuild b/audio/mppenc/mppenc.SlackBuild index bf6b198fa2..c20b364331 100644 --- a/audio/mppenc/mppenc.SlackBuild +++ b/audio/mppenc/mppenc.SlackBuild @@ -67,6 +67,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 diff --git a/audio/musepack-tools/musepack-tools.SlackBuild b/audio/musepack-tools/musepack-tools.SlackBuild index 06f77c23ee..ff1df89b42 100644 --- a/audio/musepack-tools/musepack-tools.SlackBuild +++ b/audio/musepack-tools/musepack-tools.SlackBuild @@ -69,9 +69,10 @@ patch -p1 < $CWD/musepack-tools-465-fno-common.patch mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -Wno-error=incompatible-pointer-types" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make -j1 make install DESTDIR=$PKG diff --git a/audio/musikcube/musikcube.SlackBuild b/audio/musikcube/musikcube.SlackBuild index 3862f8e7a7..bd52cbc4ea 100644 --- a/audio/musikcube/musikcube.SlackBuild +++ b/audio/musikcube/musikcube.SlackBuild @@ -82,6 +82,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|ncursesw/||" src/musikcube/cursespp/cursespp/curses_config.h + # Install .so files to /usr/lib$LIBDIRSUFFIX instead of /usr/share cp $CWD/fix-install-locations.patch . sed -i "s/lib\//lib$LIBDIRSUFFIX\//" fix-install-locations.patch diff --git a/audio/ncmpcpp/ncmpcpp.SlackBuild b/audio/ncmpcpp/ncmpcpp.SlackBuild index 9df2d26e64..fe5067e614 100644 --- a/audio/ncmpcpp/ncmpcpp.SlackBuild +++ b/audio/ncmpcpp/ncmpcpp.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ncmpcpp -VERSION=${VERSION:-0.9.2} +VERSION=${VERSION:-0.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -73,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -82,9 +79,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Needed for boost 1.89.0, thanks to MLanden on LQ! +cp -a $CWD/boost.m4 m4/ + sed -ie 's/if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))/if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4))/g' src/tags.cpp -./autogen.sh +autoreconf -fi ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/ncmpcpp/ncmpcpp.info b/audio/ncmpcpp/ncmpcpp.info index 275ef114ad..8b8e517958 100644 --- a/audio/ncmpcpp/ncmpcpp.info +++ b/audio/ncmpcpp/ncmpcpp.info @@ -1,8 +1,10 @@ PRGNAM="ncmpcpp" -VERSION="0.9.2" +VERSION="0.10.1" HOMEPAGE="http://ncmpcpp.rybczak.net" -DOWNLOAD="https://github.com/arybczak/ncmpcpp/archive/0.9.2/ncmpcpp-0.9.2.tar.gz" -MD5SUM="4ce5ed2d2dc26e2c703a0c437ee1a14c" +DOWNLOAD="https://github.com/arybczak/ncmpcpp/archive/0.10.1/ncmpcpp-0.10.1.tar.gz \ + https://raw.githubusercontent.com/tsuna/boost.m4/c88f9d1d27707d85ba39fbaeedddddd505e76e6c/build-aux/boost.m4" +MD5SUM="2c90b825291c51bd7630b909daee7cd6 \ + ec6c1e787d465ad13bd6a3283bcb5a2f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libmpdclient" diff --git a/audio/quodlibet/python3.12.patch b/audio/quodlibet/python3.12.patch new file mode 100644 index 0000000000..06024d49b3 --- /dev/null +++ b/audio/quodlibet/python3.12.patch @@ -0,0 +1,72 @@ +From a8b6f6bb34864a6821174edbf7802b689e440db3 Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Wed, 23 Aug 2023 17:13:23 +0200 +Subject: [PATCH] Fix startup on Python 3.12 + +--- + quodlibet/_import.py | 6 ++++++ + quodlibet/util/config.py | 2 +- + quodlibet/util/importhelper.py | 6 +++--- + 3 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/quodlibet/_import.py b/quodlibet/_import.py +index 5e76b67295..22bd5e3140 100644 +--- a/quodlibet/_import.py ++++ b/quodlibet/_import.py +@@ -8,6 +8,7 @@ + + import sys + import importlib ++import importlib.util + + + class RedirectImportHook: +@@ -31,6 +32,11 @@ def __init__(self, name, packages): + self._name = name + self._packages = packages + ++ def find_spec(self, fullname, path, target=None): ++ loader = self.find_module(fullname, path) ++ if loader is not None: ++ return importlib.util.spec_from_loader(fullname, loader) ++ + def find_module(self, fullname, path=None): + package = fullname.split(".")[0] + if package in self._packages: +diff --git a/quodlibet/util/config.py b/quodlibet/util/config.py +index 1c214ac0b4..f0688f9bf9 100644 +--- a/quodlibet/util/config.py ++++ b/quodlibet/util/config.py +@@ -377,7 +377,7 @@ def read(self, filename): + with open(filename, "rb") as fileobj: + fileobj = StringIO( + fileobj.read().decode("utf-8", "surrogateescape")) +- self._config.readfp(fileobj, filename) ++ self._config.read_file(fileobj, filename) + except (IOError, OSError): + return + +diff --git a/quodlibet/util/importhelper.py b/quodlibet/util/importhelper.py +index f14b11f4b6..c82ded5878 100644 +--- a/quodlibet/util/importhelper.py ++++ b/quodlibet/util/importhelper.py +@@ -92,8 +92,8 @@ def load_module(name, package, path): + except KeyError: + pass + +- loader = importlib.find_loader(fullname, [path]) +- if loader is None: ++ spec = importlib.machinery.PathFinder.find_spec(fullname, [path]) ++ if spec is None: + return + + # modules need a parent package +@@ -101,7 +101,7 @@ def load_module(name, package, path): + spec = importlib.machinery.ModuleSpec(package, None, is_package=True) + sys.modules[package] = importlib.util.module_from_spec(spec) + +- mod = loader.load_module(fullname) ++ mod = spec.loader.load_module(fullname) + + # make it accessible from the parent, like __import__ does + vars(sys.modules[package])[name] = mod diff --git a/audio/quodlibet/quodlibet.SlackBuild b/audio/quodlibet/quodlibet.SlackBuild index 2b4403ff1a..f67540185b 100644 --- a/audio/quodlibet/quodlibet.SlackBuild +++ b/audio/quodlibet/quodlibet.SlackBuild @@ -61,6 +61,7 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . +patch -p1 < $CWD/python3.12.patch find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ diff --git a/audio/soxr/soxr.SlackBuild b/audio/soxr/soxr.SlackBuild index 3928a4844a..1c2a287802 100644 --- a/audio/soxr/soxr.SlackBuild +++ b/audio/soxr/soxr.SlackBuild @@ -75,6 +75,7 @@ cmake -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DDOC_INSTALL_DIR=/usr/doc/$PRGNAM-$VERSION \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release -Wno-dev .. make make install DESTDIR=$PKG diff --git a/audio/wireplumber/README b/audio/wireplumber/README deleted file mode 100644 index 15a585ead1..0000000000 --- a/audio/wireplumber/README +++ /dev/null @@ -1,25 +0,0 @@ -Wireplumber - Session / policy manager implementation for PipeWire - -WirePlumber is a modular session / policy manager for PipeWire and a -GObject-based high-level library that wraps PipeWire’s API, -providing convenience for writing the daemon’s modules as well as -external tools for managing PipeWire. - -The WirePlumber daemon implements the session & policy management -service. It follows a modular design, having plugins that implement -the actual management functionality. - -The WirePlumber Library provides API that allows you to extend the -WirePlumber daemon, to write management or status tools for PipeWire -(apps that don’t do actual media streaming) and to write custom -session managers for embedded devices. - - -Replacement of pipewire-media : -Based on what P. Volkerding did for pulseaudio/pipewire -There are 2 scripts to enable/disable wireplumber, in /usr/sbin : -- wireplumber-enable.sh -- wireplumber-disable.sh - -For the changes to take effect : -logout / login diff --git a/audio/wireplumber/doinst.sh b/audio/wireplumber/doinst.sh deleted file mode 100644 index 9018c147db..0000000000 --- a/audio/wireplumber/doinst.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Toss redundant sample files: -for file in wireplumber.desktop ; do - cmp etc/xdg/autostart/${file} etc/xdg/autostart/${file}.sample 2> /dev/null && rm etc/xdg/autostart/${file}.sample -done - diff --git a/audio/wireplumber/slack-desc b/audio/wireplumber/slack-desc deleted file mode 100644 index 18f46d565b..0000000000 --- a/audio/wireplumber/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -wireplumber: wireplumber (Session / policy manager implementation for PipeWire) -wireplumber: -wireplumber: WirePlumber is a modular session / policy manager for -wireplumber: PipeWire and a GObject-based high-level library -wireplumber: that wraps PipeWire's API, providing convenience for writini -wireplumber: the daemon's modules as well as external tools for managing PipeWire. -wireplumber: It follows a modular design, having plugins that implement the actual -wireplumber: management functionality. -wireplumber: -wireplumber: https://gitlab.com/pipewire/wireplumber -wireplumber: diff --git a/audio/wireplumber/wireplumber-disable.sh b/audio/wireplumber/wireplumber-disable.sh deleted file mode 100644 index 9a7c8d14f0..0000000000 --- a/audio/wireplumber/wireplumber-disable.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# This script will attempt to disable pipewire as the default audio server, -# changing it back to pulseaudio. - -# Remove or rename the XDG autostart files: -for file in /etc/xdg/autostart/wireplumber.desktop ; do - if [ -r ${file}.sample ]; then - rm -f $file - elif [ -r $file ]; then - mv ${file} ${file}.sample - fi -done - -# Condition: check if pipewire is enabled -if [ -f /etc/xdg/autostart/pipewire.desktop ] ; then - # Enable pipewire-media-session.desktop: - if grep -q "^Hidden=true$" /etc/xdg/autostart/pipewire-media-session.desktop ; then - grep -v "^Hidden=true$" /etc/xdg/autostart/pipewire-media-session.desktop > /etc/xdg/autostart/pipewire-media-session.desktop.new - mv /etc/xdg/autostart/pipewire-media-session.desktop.new /etc/xdg/autostart/pipewire-media-session.desktop - fi - - echo "Pipewire Media Session enabled as media session server." - if ps ax | grep -q wireplumber ; then - echo - echo "You may need to stop running daemon/wireplumber processes." - echo "The clean way is to run these commands as the user that owns the processes:" - echo "/usr/bin/daemon --pidfiles=~/.run --name=wireplumber --stop" - echo - echo "The quick and dirty way if nothing else on the machine is using the daemon" - echo "utility is to issue this command:" - echo "killall daemon" - fi -fi - diff --git a/audio/wireplumber/wireplumber-enable.sh b/audio/wireplumber/wireplumber-enable.sh deleted file mode 100644 index 1aac9d4ae1..0000000000 --- a/audio/wireplumber/wireplumber-enable.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# This script will attempt to enable wireplumber as the default media session server. - -# Condition: check if pipewire is enabled -if [ -f /etc/xdg/autostart/pipewire.desktop ] ; then - - # Rename the XDG autostart files: - for file in /etc/xdg/autostart/wireplumber.desktop.sample ; do - if [ -r $file ]; then - mv $file /etc/xdg/autostart/$(basename $file .sample) - fi - done - - # Disable pipewire-media-session.desktop: - if ! grep -q "^Hidden=true$" /etc/xdg/autostart/pipewire-media-session.desktop ; then - echo "Hidden=true" >> /etc/xdg/autostart/pipewire-media-session.desktop - fi - echo "Wireplumber enabled as system media session server." -else - echo "Pipewire is disabled" - echo "you must enable pipewire first : /usr/sbin/pipewire-enable.sh" -fi diff --git a/audio/wireplumber/wireplumber.SlackBuild b/audio/wireplumber/wireplumber.SlackBuild deleted file mode 100644 index fc92c597cd..0000000000 --- a/audio/wireplumber/wireplumber.SlackBuild +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/bash - -# Copyright 2022, marav, Paris, FR -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20241018 bkw: Modified by SlackBuilds.org, BUILD=3: build with lua 5.4. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=wireplumber -VERSION=${VERSION:-0.4.7} -BUILD=${BUILD:-3} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z || exit 1 -cd $PRGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -# Set options to build with or without documentation / introspection -# These options are disabled by default -WITHDOC=${WITHDOC:-no} -WITHINTROSPEC=${WITHINTROSPEC:-no} - -if [ $WITHDOC == "no" ]; then - DOC_OPTION="-Ddoc=disabled" - else - DOC_OPTION="-Ddoc=auto" -fi - -if [ $WITHINTROSPEC == "no" ]; then - INTROSPEC_OPTION="-Dintrospection=disabled" - else - INTROSPEC_OPTION="-Dintrospection=auto" -fi - -# Configure, build, and install: -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -mkdir meson-build -cd meson-build -meson setup \ - --prefix=/usr \ - --libdir=lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/libexec \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --includedir=/usr/include \ - --datadir=/usr/share \ - --mandir=/usr/man \ - -Dsystem-lua=true \ - -Dsystemd=disabled \ - -Dsystemd-user-service=false \ - $DOC_OPTION \ - $INTROSPEC_OPTION \ - .. - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -# Add sample configuation files: -mkdir -p $PKG/etc/xdg/autostart -cp -a $CWD/wireplumber.desktop.sample $PKG/etc/xdg/autostart -chown root:root $PKG/etc/xdg/autostart/* -chmod 644 $PKG/etc/xdg/autostart/* - -mkdir -p $PKG/usr/sbin -cp -a $CWD/wireplumber-disable.sh $PKG/usr/sbin -cp -a $CWD/wireplumber-enable.sh $PKG/usr/sbin -chown root:root $PKG/usr/sbin/wireplumber-disable.sh $PKG/usr/sbin/wireplumber-enable.sh -chmod 755 $PKG/usr/sbin/wireplumber-disable.sh $PKG/usr/sbin/wireplumber-enable.sh - -# Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - LICENSE NEWS.rst README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE - diff --git a/audio/wireplumber/wireplumber.desktop.sample b/audio/wireplumber/wireplumber.desktop.sample deleted file mode 100644 index d3ebdea2d3..0000000000 --- a/audio/wireplumber/wireplumber.desktop.sample +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Wireplumber -Comment=Start the Wireplumber -Exec=/usr/bin/daemon -frB --pidfiles=~/.run --name=wireplumber /usr/bin/wireplumber -Terminal=false -Type=Application -X-GNOME-Autostart-Phase=Initialization -X-KDE-autostart-after=pipewire -X-KDE-autostart-phase=1 diff --git a/audio/wireplumber/wireplumber.info b/audio/wireplumber/wireplumber.info deleted file mode 100644 index 158b48bbed..0000000000 --- a/audio/wireplumber/wireplumber.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wireplumber" -VERSION="0.4.7" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" -DOWNLOAD="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.7/wireplumber-0.4.7.tar.gz" -MD5SUM="9e63d8944f91b6a4646a736b1f1db251" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="lua" -MAINTAINER="marav" -EMAIL="marav8@free.fr" diff --git a/business/ledger/boost-185.patch b/business/ledger/boost-185.patch new file mode 100644 index 0000000000..f0c1f6a8c2 --- /dev/null +++ b/business/ledger/boost-185.patch @@ -0,0 +1,22 @@ +From 1da89f6ffb44a44257b9774c4ceb71e7b495d677 Mon Sep 17 00:00:00 2001 +From: Michael Cho +Date: Thu, 25 Apr 2024 11:29:49 -0400 +Subject: [PATCH] Fix build with Boost 1.85.0 + +Signed-off-by: Michael Cho +--- + src/system.hh.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/system.hh.in b/src/system.hh.in +index 05f28fc24..070f1cd4a 100644 +--- a/src/system.hh.in ++++ b/src/system.hh.in +@@ -140,7 +140,6 @@ + #include + #include + +-#include + #include + #include + #include diff --git a/business/ledger/ledger.SlackBuild b/business/ledger/ledger.SlackBuild index 9e4abd59bf..91c849db50 100644 --- a/business/ledger/ledger.SlackBuild +++ b/business/ledger/ledger.SlackBuild @@ -52,6 +52,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ patch -p1 < $CWD/boost-176.patch +patch -p1 < $CWD/boost-185.patch # 20220301 bkw: do not look for utfcpp's headers in /usr/include, use # only the bundled copy (otherwise the build breaks if utfcpp is installed). diff --git a/desktop/afterstep/afterstep.SlackBuild b/desktop/afterstep/afterstep.SlackBuild index 0eefdeeb3a..8d2cc4d290 100644 --- a/desktop/afterstep/afterstep.SlackBuild +++ b/desktop/afterstep/afterstep.SlackBuild @@ -88,7 +88,7 @@ patch -p1 < $CWD/binutils-2.36.patch # /etc/alternatives (not inside $PKG). Stop it. sed -i '/^install:/s, *install\.alternative,,' src/afterstep/Makefile.in -CFLAGS="$SLKCFLAGS -fgnu89-inline" \ +CFLAGS="$SLKCFLAGS -std=gnu89 -fgnu89-inline" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/desktop/birdtray/birdtray.SlackBuild b/desktop/birdtray/birdtray.SlackBuild index 56564b8aa8..5ac2064a5d 100644 --- a/desktop/birdtray/birdtray.SlackBuild +++ b/desktop/birdtray/birdtray.SlackBuild @@ -87,6 +87,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/desktop/cmatrix/cmatrix.SlackBuild b/desktop/cmatrix/cmatrix.SlackBuild index 3be24327b4..357a2a81d6 100644 --- a/desktop/cmatrix/cmatrix.SlackBuild +++ b/desktop/cmatrix/cmatrix.SlackBuild @@ -21,8 +21,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cmatrix -VERSION=${VERSION:-1.2a} -BUILD=${BUILD:-3} +VERSION=${VERSION:-20231209_5c082c6} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -63,33 +63,34 @@ 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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux - -make +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. # Manual install - patching the Makefile not worth it -mkdir -p $PKG/usr/{bin,man/man1,share/{kbd/consolefonts,fonts/misc}} -install -s $PRGNAM $PKG/usr/bin +mkdir -p $PKG/usr/share/{kbd/consolefonts,fonts/misc} cp -a matrix.fnt matrix.psf.gz $PKG/usr/share/kbd/consolefonts -gzip -9c < cmatrix.1 > $PKG/usr/man/man1/cmatrix.1.gz gzip -9c < mtx.pcf > $PKG/usr/share/fonts/misc/mtx.pcf.gz +mv $PKG/usr/share/man $PKG/usr +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING README ChangeLog NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING README* ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/cmatrix/cmatrix.info b/desktop/cmatrix/cmatrix.info index fdfc036429..2779fe71df 100644 --- a/desktop/cmatrix/cmatrix.info +++ b/desktop/cmatrix/cmatrix.info @@ -1,8 +1,8 @@ PRGNAM="cmatrix" VERSION="1.2a" HOMEPAGE="http://www.asty.org/cmatrix/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/cmatrix-1.2a.tar.gz" -MD5SUM="ebfb5733104a258173a9ccf2669968a1" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/cmatrix-20231209_5c082c6.tar.xz" +MD5SUM="c878071e2e8a5fdbf581b46069cb9e79" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/enlightenment/enlightenment.SlackBuild b/desktop/enlightenment/enlightenment.SlackBuild index a19ab7b9b9..707ea2eb62 100644 --- a/desktop/enlightenment/enlightenment.SlackBuild +++ b/desktop/enlightenment/enlightenment.SlackBuild @@ -31,8 +31,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=enlightenment -VERSION=${VERSION:-0.26.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.27.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -46,9 +46,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/desktop/enlightenment/enlightenment.info b/desktop/enlightenment/enlightenment.info index ea468f8e1f..d9182fe2cd 100644 --- a/desktop/enlightenment/enlightenment.info +++ b/desktop/enlightenment/enlightenment.info @@ -1,8 +1,8 @@ PRGNAM="enlightenment" -VERSION="0.26.0" +VERSION="0.27.1" HOMEPAGE="https://www.enlightenment.org/" -DOWNLOAD="https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.26.0.tar.xz" -MD5SUM="17cbf0f2dfe419019cc90f4392d9980d" +DOWNLOAD="https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.27.1.tar.xz" +MD5SUM="03834b8ac5fa249c0659e37094ae52ca" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="efl" diff --git a/desktop/flatpak/flatpak.SlackBuild b/desktop/flatpak/flatpak.SlackBuild index 8c9eba3f1e..fba70c9174 100644 --- a/desktop/flatpak/flatpak.SlackBuild +++ b/desktop/flatpak/flatpak.SlackBuild @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=flatpak -VERSION=${VERSION:-1.12.7} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.16.0} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,26 +79,31 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --with-system-bubblewrap - -make -make install-strip DESTDIR=$PKG - -gzip -9 $PKG/usr/man/man*/* +mkdir build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + -Dsystem_bubblewrap=bwrap \ + -Ddocdir=/usr/doc/$PRGNAM-$VERSION \ + -Dstrip=true + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +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 + chmod +x $PKG/etc/profile.d/flatpak.sh mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/desktop/flatpak/flatpak.info b/desktop/flatpak/flatpak.info index 04979fe208..6e75f9d2f2 100644 --- a/desktop/flatpak/flatpak.info +++ b/desktop/flatpak/flatpak.info @@ -1,10 +1,10 @@ PRGNAM="flatpak" -VERSION="1.12.7" +VERSION="1.16.0" HOMEPAGE="https://flatpak.org/" -DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/1.12.7/flatpak-1.12.7.tar.xz" -MD5SUM="07d32580019572d5952cb0cadb073493" +DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/1.16.0/flatpak-1.16.0.tar.xz" +MD5SUM="bdf866646fb312a341f84669f625488b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="bubblewrap ostree appstream-glib xdg-desktop-portal-gtk" +REQUIRES="bubblewrap ostree AppStream xdg-desktop-portal-gtk" MAINTAINER="Vincent Batts" EMAIL="vbatts@hashbangbash.com" diff --git a/desktop/florence/florence-c99.patch b/desktop/florence/florence-c99.patch new file mode 100644 index 0000000000..190af3e37e --- /dev/null +++ b/desktop/florence/florence-c99.patch @@ -0,0 +1,32 @@ +Do not call the undeclared wait function. Part of this upstream +commit: + +commit d1bc2d6b932d6f09a34d391a7e1f56ff1d622e0e +Author: François Agrech +Date: Wed Nov 5 08:26:54 2014 +0100 + + Use pango instead of cairo toy text api. + + This fixes a regression on previous fallback font patch. + +diff --git a/src/controller.c b/src/controller.c +index a0754993fa0a42e9..686146f2e29f4fff 100644 +--- a/src/controller.c ++++ b/src/controller.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #define MOVING_THRESHOLD 15 + +@@ -46,7 +47,7 @@ void controller_icon_expose (GtkWidget *window, cairo_t* context, void *userdata + cairo_paint(context); + cairo_set_operator(context, CAIRO_OPERATOR_SOURCE); + style_render_svg(context, handle, w, h, FALSE, NULL); +- wait(); ++ wait(NULL); + END_FUNC + } + diff --git a/desktop/florence/florence.SlackBuild b/desktop/florence/florence.SlackBuild index 1e6d430abf..1971d54da8 100644 --- a/desktop/florence/florence.SlackBuild +++ b/desktop/florence/florence.SlackBuild @@ -60,9 +60,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 {} \; +patch -p1 < $CWD/florence-c99.patch + # disable docs, needs scrollkeeper (gnome dependency) -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu17" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -73,6 +75,8 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --without-docs \ --disable-static \ + --without-at-spi \ + --without-notification \ --build=$ARCH-slackware-linux # Arch was those. Why? diff --git a/desktop/foot/foot.SlackBuild b/desktop/foot/foot.SlackBuild index 168fce7fda..4f0f759cd2 100644 --- a/desktop/foot/foot.SlackBuild +++ b/desktop/foot/foot.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=foot -VERSION=${VERSION:-1.15.3} +VERSION=${VERSION:-1.24.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -66,9 +66,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.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 \ diff --git a/desktop/foot/foot.info b/desktop/foot/foot.info index d0f058aa6a..747e1907de 100644 --- a/desktop/foot/foot.info +++ b/desktop/foot/foot.info @@ -1,8 +1,8 @@ PRGNAM="foot" -VERSION="1.15.3" +VERSION="1.24.0" HOMEPAGE="https://codeberg.org/dnkl/foot" -DOWNLOAD="https://codeberg.org/dnkl/foot/archive/1.15.3.tar.gz" -MD5SUM="a5dd0c558eaf5bd6ff139e33d2b46a0b" +DOWNLOAD="https://codeberg.org/dnkl/foot/releases/download/1.24.0/foot-1.24.0.tar.gz" +MD5SUM="fae6b10b386317445f02431ba1b75545" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fcft" diff --git a/desktop/glabels/glabels.SlackBuild b/desktop/glabels/glabels.SlackBuild index 7ecdaa4e6b..86805e3fef 100644 --- a/desktop/glabels/glabels.SlackBuild +++ b/desktop/glabels/glabels.SlackBuild @@ -81,7 +81,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 -w -Wl,--allow-multiple-definition" \ +CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition -Wno-incompatible-pointer-types" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/desktop/labwc/README b/desktop/labwc/README deleted file mode 100644 index ff0fac3134..0000000000 --- a/desktop/labwc/README +++ /dev/null @@ -1,45 +0,0 @@ -Labwc is a wlroots-based stacking compositor aiming to be lightweight -and independent, with a focus on simply stacking windows well and -rendering some window decorations. It relies on clients for wallpaper, -panels, screenshots, and so on to create a full desktop environment. -Labwc tries to stay in keeping with wlroots and sway in terms of general -approach and coding style. -In order to avoid reinventing configuration and theme syntax, -the openbox-3.4 specification is used. This does not mean that labwc -is an openbox clone but rather that configuration files will look and -feel familiar. - -labwc supports the following: - -•Config files (rc.xml, autostart, environment) -•Theme files and xbm icons -•Damage tracking to reduce CPU usage -•A basic root-menu (configured with menu.xml) -•HiDPI -•wlr-output-management protocol -•layer-shell protocol -•foreign-toplevel protocol (e.g. to integrate with panels and bars) -•Optionally xwayland - -Labwc uses the files listed below for configuration and theming. -get them from labwc github web page. - -file user over-ride location - -•rc.xml ~/.config/labwc/ -•menu.xml ~/.config/labwc/ -•autostart ~/.config/labwc/ -•environment ~/.config/labwc/ -•themerc ~/.local/share/themes//openbox-3/ - -Suggested apps to use with labwc: - -Suggested apps to use with labwc: - -•Screen shooter: grim -•Screen recorder: wf-recorder -•Background image: swaybg -•Panel: waybar, yambar, lavalauncher, sfwbar -•Launchers: bemenu, fuzzel, wofi -•Output managers: wlopm, kanshi, wlr-randr -•Screen locker: swaylock diff --git a/desktop/labwc/doinst.sh b/desktop/labwc/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/desktop/labwc/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/desktop/labwc/labwc.SlackBuild b/desktop/labwc/labwc.SlackBuild deleted file mode 100644 index 2bccf4e234..0000000000 --- a/desktop/labwc/labwc.SlackBuild +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash - -# Slackware build script for labwc - -# Copyright 2022 Damian Perticone, Berisso, Argentina -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=labwc -VERSION=${VERSION:-0.5.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dstrip=true \ - -Dxwayland=enabled \ - - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install - -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -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 CONTRIBUTING.md LICENSE NEWS.md README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/desktop/labwc/labwc.info b/desktop/labwc/labwc.info deleted file mode 100644 index aa34d84483..0000000000 --- a/desktop/labwc/labwc.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="labwc" -VERSION="0.5.3" -HOMEPAGE="https://github.com/labwc/labwc" -DOWNLOAD="https://github.com/labwc/labwc/archive/0.5.3/labwc-0.5.3.tar.gz" -MD5SUM="817c72eb416ed3d2e079e891d93a326b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="wlroots" -MAINTAINER="Damian Perticone" -EMAIL="mjolnirdam@gmail.com" diff --git a/desktop/labwc/slack-desc b/desktop/labwc/slack-desc deleted file mode 100644 index 66267c4411..0000000000 --- a/desktop/labwc/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -labwc: labwc (wlroots-based stacking compositor) -labwc: -labwc: Labwc s a wlroots-based stacking compositor aiming to be lightweight -labwc: and independent, with a focus on simply stacking windows well and -labwc: rendering some window decorations. -labwc: -labwc: -labwc: -labwc: -labwc: Home: https://github.com/labwc/labwc -labwc: diff --git a/desktop/libqtxdg/libqtxdg.SlackBuild b/desktop/libqtxdg/libqtxdg.SlackBuild index 7d4f1f175d..d614e22d81 100644 --- a/desktop/libqtxdg/libqtxdg.SlackBuild +++ b/desktop/libqtxdg/libqtxdg.SlackBuild @@ -84,6 +84,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_TESTS=Yes \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/desktop/lxhotkey/lxhotkey.SlackBuild b/desktop/lxhotkey/lxhotkey.SlackBuild index 50ab850291..4213d30413 100644 --- a/desktop/lxhotkey/lxhotkey.SlackBuild +++ b/desktop/lxhotkey/lxhotkey.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxhotkey -VERSION=${VERSION:-0.1.1} +VERSION=${VERSION:-0.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/lxhotkey/lxhotkey.info b/desktop/lxhotkey/lxhotkey.info index 2081cd37b3..abef1477c0 100644 --- a/desktop/lxhotkey/lxhotkey.info +++ b/desktop/lxhotkey/lxhotkey.info @@ -1,10 +1,10 @@ PRGNAM="lxhotkey" -VERSION="0.1.1" +VERSION="0.1.2" HOMEPAGE="https://wiki.lxde.org/en/LXHotkey" -DOWNLOAD="https://downloads.sourceforge.net/lxde/lxhotkey-0.1.1.tar.xz" -MD5SUM="8c932c568fa822f3e1bf4ce23f00d881" +DOWNLOAD="https://github.com/lxde/releases/raw/refs/heads/master/releases/lxhotkey-0.1.2.tar.xz" +MD5SUM="200f18fc8cef1f8ffaf6e1e82b01f80c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libfm" +REQUIRES="libfm openbox" MAINTAINER="Leo C." EMAIL="leoc@gmx.com" diff --git a/desktop/macopix/macopix.SlackBuild b/desktop/macopix/macopix.SlackBuild index 069597e6f3..811d3e170d 100644 --- a/desktop/macopix/macopix.SlackBuild +++ b/desktop/macopix/macopix.SlackBuild @@ -68,7 +68,7 @@ sed -i \ configure LDFLAGS="-lX11" \ -CFLAGS="$SLKCFLAGS -fcommon" \ +CFLAGS="$SLKCFLAGS -fcommon -std=gnu17" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/desktop/murrine/gtk-murrine-engine-c99.patch b/desktop/murrine/gtk-murrine-engine-c99.patch new file mode 100644 index 0000000000..b4d1610949 --- /dev/null +++ b/desktop/murrine/gtk-murrine-engine-c99.patch @@ -0,0 +1,634 @@ + + + + + + Tree - rpms/gtk-murrine-engine - src.fedoraproject.org + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+
+
+

+

+
+
+

+rpms / gtk-murrine-engine +

+
+
+
+
+
+
+ + + Clone + +
+
+
+
Source Code
+ +
+
+
GIT
+ +
+
+
+
+
+ +
+
+
+
+ + +
+
+ +
+
+
+
+
+
+
+

+ Files +

+
+ +
+
+ +
+
+
+
+
+
    +
  1. + + +   e3f6ab3d10f3124353ace08471dd42b87af76399 + +
    2. +
  2. + +   gtk-murrine-engine-c99.patch +
    3. +
+
+ +
+
+
+ + +
+ + Blob + + Blame + + History + + Raw +
+ + 
Add a few missing function prototypes, to avoid future build failures once
+compilers start to reject implicit function declarations by default.
+
+diff -ur murrine-0.98.2.orig/src/murrine_rc_style.h murrine-0.98.2/src/murrine_rc_style.h
+--- murrine-0.98.2.orig/src/murrine_rc_style.h	2012-01-17 18:46:01.000000000 +0100
++++ murrine-0.98.2/src/murrine_rc_style.h	2022-12-14 21:33:03.242067429 +0100
+@@ -154,5 +154,6 @@
+ };
+ 
+ GType murrine_rc_style_get_type	(void);
++void murrine_rc_style_register_types (GTypeModule *module);
+ 
+ #endif /* MURRINE_RC_STYLE_H */
+diff -ur murrine-0.98.2.orig/src/murrine_style.h murrine-0.98.2/src/murrine_style.h
+--- murrine-0.98.2.orig/src/murrine_style.h	2012-01-17 18:46:01.000000000 +0100
++++ murrine-0.98.2/src/murrine_style.h	2022-12-14 21:33:41.604671684 +0100
+@@ -102,5 +102,6 @@
+ };
+ 
+ GType murrine_style_get_type (void);
++void murrine_style_register_types (GTypeModule *module);
+ 
+ #endif /* MURRINE_STYLE_H */
+diff -ur murrine-0.98.2.orig/src/support.h murrine-0.98.2/src/support.h
+--- murrine-0.98.2.orig/src/support.h	2012-01-17 18:46:01.000000000 +0100
++++ murrine-0.98.2/src/support.h	2022-12-14 21:27:27.288533100 +0100
+@@ -118,6 +118,10 @@
+ 
+ #define MRN_WIDGET_HAS_DEFAULT(object) ((object) && MRN_IS_WIDGET(object) && GTK_WIDGET_HAS_DEFAULT(object))
+ 
++gboolean murrine_object_is_a (const GObject * object, const gchar * type_name);
++gboolean murrine_widget_is_ltr (GtkWidget *widget);
++
++
+ G_GNUC_INTERNAL GtkTextDirection murrine_get_direction (GtkWidget *widget);
+ G_GNUC_INTERNAL GtkWidget *murrine_special_get_ancestor (GtkWidget *widget, GType widget_type);
+ G_GNUC_INTERNAL GdkColor* murrine_get_parent_bgcolor (GtkWidget *widget);
+
+
+
+ +
+
+
+
+ +
+
+
+
+
Powered by Pagure 5.13.3
+ +
+
+
© Red Hat, Inc. and others.
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/desktop/murrine/murrine.SlackBuild b/desktop/murrine/murrine.SlackBuild index 5c701a4983..56754d0998 100644 --- a/desktop/murrine/murrine.SlackBuild +++ b/desktop/murrine/murrine.SlackBuild @@ -80,6 +80,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/gtk-murrine-engine-c99.patch # Fix build with slibtool # https://bazaar.launchpad.net/~murrine-daily/murrine/trunk/revision/380/Makefile.am patch -p0 < $CWD/380_379.diff diff --git a/desktop/obconf/obconf-c99.patch b/desktop/obconf/obconf-c99.patch new file mode 100644 index 0000000000..8848f8bce1 --- /dev/null +++ b/desktop/obconf/obconf-c99.patch @@ -0,0 +1,47 @@ +Avoid implicit function declarations + +For compatibility with future compilers which do not support them +by default. + +Include for toupper, "moveresize.h" for +moveresize_setup_tab, and add a desktops_setup_tab prototype to +"desktops.h" because it is called from main.c. + +Submitted upstream: + +diff --git a/src/appearance.c b/src/appearance.c +index 4fb3f0c12ad9b143..da39273a16a3aea7 100644 +--- a/src/appearance.c ++++ b/src/appearance.c +@@ -21,6 +21,8 @@ + #include "tree.h" + #include "preview_update.h" + ++#include ++ + static gboolean mapping = FALSE; + + static RrFont *read_font(GtkFontButton *w, const gchar *place, gboolean def); +diff --git a/src/desktops.h b/src/desktops.h +index 1ba3e366d41f5c3d..5f7e32321dbfa3c4 100644 +--- a/src/desktops.h ++++ b/src/desktops.h +@@ -24,5 +24,6 @@ + + void desktops_setup_num(GtkWidget *w); + void desktops_setup_names(GtkWidget *w); ++void desktops_setup_tab(void); + + #endif +diff --git a/src/main.c b/src/main.c +index d7e34469ecc72914..017603537c1f8de1 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -28,6 +28,7 @@ + #include "dock.h" + #include "preview_update.h" + #include "gettext.h" ++#include "moveresize.h" + + #include + #define SN_API_NOT_YET_FROZEN diff --git a/desktop/obconf/obconf.SlackBuild b/desktop/obconf/obconf.SlackBuild index 3ad3b1976c..d5769b1c2b 100644 --- a/desktop/obconf/obconf.SlackBuild +++ b/desktop/obconf/obconf.SlackBuild @@ -81,6 +81,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/obconf-c99.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild index 36d3f279e6..80501d9f46 100644 --- a/desktop/openbox/openbox.SlackBuild +++ b/desktop/openbox/openbox.SlackBuild @@ -102,6 +102,8 @@ find -L . \ # Convert openbox-xdg-autostart from python2 to python3 patch -p1 < $CWD/py2-to-py3.patch +for i in $CWD/patches/* ; do patch -p1 < $i ; done + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/openbox/patches/917204_undecorated_maximized_no_border.patch b/desktop/openbox/patches/917204_undecorated_maximized_no_border.patch new file mode 100644 index 0000000000..915cc1ea9a --- /dev/null +++ b/desktop/openbox/patches/917204_undecorated_maximized_no_border.patch @@ -0,0 +1,22 @@ +Description: Removed top border on undecorated maximized windows +Author: Valentin Blot +Origin: other +Bug-Debian: https://bugs.debian.org/917204 +Forwarded: no +Last-Update: 2018-12-23 + +--- a/openbox/frame.c ++++ b/openbox/frame.c +@@ -585,12 +585,6 @@ void frame_adjust_area(ObFrame *self, gb + + if (self->decorations & OB_FRAME_DECOR_TITLEBAR) + self->size.top += ob_rr_theme->title_height + self->bwidth; +- else if (self->max_horz && self->max_vert) { +- /* A maximized and undecorated window needs a border on the +- top of the window to let the user still undecorate/unmaximize the +- window via the client menu. */ +- self->size.top += self->bwidth; +- } + + if (self->decorations & OB_FRAME_DECOR_HANDLE && + ob_rr_theme->handle_height > 0) diff --git a/desktop/openbox/patches/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch b/desktop/openbox/patches/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch new file mode 100644 index 0000000000..ef68d31213 --- /dev/null +++ b/desktop/openbox/patches/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch @@ -0,0 +1,50 @@ +From 9ed6fdd71890c5cc43747f105382d5677e5d37e7 Mon Sep 17 00:00:00 2001 +From: pldubouilh +Date: Fri, 17 Mar 2023 18:23:47 +0100 +Subject: [PATCH] Fix list traversal issue in client_calc_layer + +The calls to client_calc_layer_internal can modify stacking_list, which +can cause us to follow dangling ->next pointers (either by the pointer +itself already being freed, or it pointing to a freed area). Avoid this +by copying the list first, the goal is to visit every client in the list +once so this should be fine. +--- + openbox/client.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/openbox/client.c b/openbox/client.c +index 7168b2407..b8264587c 100644 +--- a/openbox/client.c ++++ b/openbox/client.c +@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self) + void client_calc_layer(ObClient *self) + { + GList *it; ++ /* the client_calc_layer_internal calls below modify stacking_list, ++ so we have to make a copy to iterate over */ ++ GList *list = g_list_copy(stacking_list); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* find the windows in the fullscreen layer, and mark them not-visited */ +@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self) + client_calc_layer_internal(self); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* now recalc any windows in the fullscreen layer which have not +@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self) + !WINDOW_AS_CLIENT(it->data)->visited) + client_calc_layer_internal(it->data); + } ++ ++ g_list_free(it); + } + + gboolean client_should_show(ObClient *self) diff --git a/desktop/openbox/patches/debian-887908.patch b/desktop/openbox/patches/debian-887908.patch new file mode 100644 index 0000000000..2c8794ed7f --- /dev/null +++ b/desktop/openbox/patches/debian-887908.patch @@ -0,0 +1,31 @@ +Description: Fix toggled hover and pressed images masks not loaded +Author: "E. Serradilla" +Debian-Bugs: https://bugs.debian.org/887908 + +--- a/obrender/theme.c ++++ b/obrender/theme.c +@@ -1494,8 +1494,10 @@ static void read_button_styles(XrmDataba + READ_BUTTON_MASK_COPY(disabled, btn->unpressed_mask); + READ_BUTTON_MASK_COPY(hover, btn->unpressed_mask); + if (toggled_mask) { +- READ_BUTTON_MASK_COPY(pressed_toggled, btn->unpressed_toggled_mask); +- READ_BUTTON_MASK_COPY(hover_toggled, btn->unpressed_toggled_mask); ++ g_snprintf(name, 128, "%s_toggled_pressed.xbm", btnname); ++ READ_MASK_COPY(name, btn->pressed_toggled_mask, btn->unpressed_toggled_mask); ++ g_snprintf(name, 128, "%s_toggled_hover.xbm", btnname); ++ READ_MASK_COPY(name, btn->hover_toggled_mask, btn->unpressed_toggled_mask); + } + + #define READ_BUTTON_APPEARANCE(typedots, type, fallback) \ +@@ -1532,8 +1534,8 @@ static void read_button_styles(XrmDataba + READ_BUTTON_APPEARANCE("disabled", disabled, 0); + READ_BUTTON_APPEARANCE("hover", hover, 0); + if (toggled_mask) { +- READ_BUTTON_APPEARANCE("unpressed.toggled", unpressed_toggled, 1); +- READ_BUTTON_APPEARANCE("pressed.toggled", pressed_toggled, 0); +- READ_BUTTON_APPEARANCE("hover.toggled", hover_toggled, 0); ++ READ_BUTTON_APPEARANCE("toggled.unpressed", unpressed_toggled, 1); ++ READ_BUTTON_APPEARANCE("toggled.pressed", pressed_toggled, 0); ++ READ_BUTTON_APPEARANCE("toggled.hover", hover_toggled, 0); + } + } diff --git a/desktop/polybar/polybar.SlackBuild b/desktop/polybar/polybar.SlackBuild index 3dd1cd15fb..9b0d881db9 100644 --- a/desktop/polybar/polybar.SlackBuild +++ b/desktop/polybar/polybar.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=polybar -VERSION=${VERSION:-3.5.7} +VERSION=${VERSION:-3.7.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -90,6 +90,10 @@ sed -i -e "/execute_process(COMMAND git describe --tags --dirty=-git/s/git.*/ech export PYTHON=python3 +sed -i '1 i\#include ' include/ipc/msg.hpp \ + include/utils/string.hpp include/utils/color.hpp + +export LDFLAGS="-lfreetype" mkdir -p build cd build cmake \ @@ -99,6 +103,9 @@ cd build -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DCMAKE_SHARED_LINKER_FLAGS="-lfreetype" \ + -Wno-dev \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/desktop/polybar/polybar.info b/desktop/polybar/polybar.info index 05fa0147f1..f0d671e4bc 100644 --- a/desktop/polybar/polybar.info +++ b/desktop/polybar/polybar.info @@ -1,10 +1,10 @@ PRGNAM="polybar" -VERSION="3.5.7" +VERSION="3.7.2" HOMEPAGE="https://github.com/polybar/polybar" -DOWNLOAD="https://github.com/polybar/polybar/archive/3.5.7/polybar-3.5.7.tar.gz \ +DOWNLOAD="https://github.com/polybar/polybar/archive/3.7.2/polybar-3.7.2.tar.gz \ https://github.com/jaagr/i3ipcpp/archive/v0.7.0/i3ipcpp-0.7.0.tar.gz \ https://ponce.cc/slackware/sources/repo/xpp-20210303_7a9960b.tar.xz" -MD5SUM="edd10b832951de562e5fb815371441d1 \ +MD5SUM="f07ed5b7cc8776e397308bd4474e3690 \ 572b9f058bab2d19fcc3f44f4601b739 \ 261f9f5f4f8bd21454820df20150af6c" DOWNLOAD_x86_64="" diff --git a/desktop/qlipper/qlipper.SlackBuild b/desktop/qlipper/qlipper.SlackBuild index ed1deb910e..42c59a9459 100644 --- a/desktop/qlipper/qlipper.SlackBuild +++ b/desktop/qlipper/qlipper.SlackBuild @@ -87,6 +87,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/desktop/redshift/redshift.SlackBuild b/desktop/redshift/redshift.SlackBuild index 4cbc6067b1..4969407f85 100644 --- a/desktop/redshift/redshift.SlackBuild +++ b/desktop/redshift/redshift.SlackBuild @@ -69,13 +69,7 @@ then CLUE2="--disable-geoclue2" fi -# build redshift-gtk, forcing python2 if python3 is not present -# thanks to the fedora project for the patch -if ! $(command -v python3 &>/dev/null); then - sed -i 's/\(AM_PATH_PYTHON(\[\)3\.2/\12.7/' configure.ac - sed -i 's/\(env python\)3/\1/' src/redshift-gtk/redshift-gtk.in - autopoint -f && AUTOPOINT="intltoolize --automake --copy" autoreconf -vif -fi +autoreconf -fi # Disable AppIndicator support if desired (uncomment next line) # cat $CWD/disable-appindicator.patch | patch -p1 || exit 1 diff --git a/desktop/river/README b/desktop/river/README index fc842dab19..0cb822f755 100644 --- a/desktop/river/README +++ b/desktop/river/README @@ -14,7 +14,7 @@ For complete documentation see the river(1), riverctl(1), and rivertile(1) man pages here is an example of init to river it goes in /home/youruser/.config/river -https://github.com/riverwm/river/blob/master/example/init +https://codeberg.org/river/river/src/branch/0.3.x/example/init edit it as you like. diff --git a/desktop/river/river.SlackBuild b/desktop/river/river.SlackBuild index 51ee4bcd52..cc38503759 100644 --- a/desktop/river/river.SlackBuild +++ b/desktop/river/river.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=river -VERSION=${VERSION:-0.1.3} +VERSION=${VERSION:-0.3.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,7 +76,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 {} \; -DESTDIR=$PKG zig build install -Drelease-safe -Dxwayland -Dman-pages -Dcpu=baseline \ +DESTDIR=$PKG zig build install -Doptimize=ReleaseSafe -Dxwayland -Dman-pages -Dcpu=baseline \ --prefix '/usr' cp -r $PKG/usr/share/man /$PKG/usr/man diff --git a/desktop/river/river.info b/desktop/river/river.info index 8ab1d35b65..62d3ab588e 100644 --- a/desktop/river/river.info +++ b/desktop/river/river.info @@ -1,10 +1,10 @@ PRGNAM="river" -VERSION="0.1.3" -HOMEPAGE="https://github.com/riverwm/river" +VERSION="0.3.12" +HOMEPAGE="https://codeberg.org/river/river/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/riverwm/river/releases/download/v0.1.3/river-0.1.3.tar.gz" -MD5SUM_x86_64="12b1caba61c9e174bc17f76940d3a2c0" +DOWNLOAD_x86_64="https://codeberg.org/river/river/releases/download/v0.3.12/river-0.3.12.tar.gz" +MD5SUM_x86_64="fa9e06982faac8d05b7401b719824ab3" REQUIRES="wlroots zig" MAINTAINER="Damian Perticone" EMAIL="mjolnirdam@gmail.com" diff --git a/desktop/river/slack-desc b/desktop/river/slack-desc index 5408428be6..332996d8dd 100644 --- a/desktop/river/slack-desc +++ b/desktop/river/slack-desc @@ -12,7 +12,7 @@ river: River is a dynamic tiling Wayland compositor with flexible river: runtime configuration. river: river: -river: Home: https://github.com/ifreund/river +river: Home: https://codeberg.org/river/river river: river: river: diff --git a/desktop/rofi/fix_xfce4-terminal_binary_name.patch b/desktop/rofi/fix_xfce4-terminal_binary_name.patch new file mode 100644 index 0000000000..c329a0e498 --- /dev/null +++ b/desktop/rofi/fix_xfce4-terminal_binary_name.patch @@ -0,0 +1,13 @@ +diff --git a/script/rofi-sensible-terminal b/script/rofi-sensible-terminal +index bab92d80..067a218a 100755 +--- a/script/rofi-sensible-terminal ++++ b/script/rofi-sensible-terminal +@@ -9,7 +9,7 @@ + # We welcome patches that add distribution-specific mechanisms to find the + # preferred terminal emulator. On Debian, there is the x-terminal-emulator + # symlink for example. +-for terminal in $TERMINAL x-terminal-emulator urxvt rxvt st terminology qterminal Eterm aterm uxterm xterm roxterm xfce4-terminal.wrapper mate-terminal lxterminal konsole alacritty kitty wezterm ghostty; do ++for terminal in $TERMINAL x-terminal-emulator urxvt rxvt st terminology qterminal Eterm aterm uxterm xterm roxterm xfce4-terminal mate-terminal lxterminal konsole alacritty kitty wezterm ghostty; do + if command -v $terminal >/dev/null 2>&1; then + exec $terminal "$@" + fi diff --git a/desktop/rofi/rofi.SlackBuild b/desktop/rofi/rofi.SlackBuild index 7e0c184f49..669ece979f 100644 --- a/desktop/rofi/rofi.SlackBuild +++ b/desktop/rofi/rofi.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rofi -VERSION=${VERSION:-1.7.5} +VERSION=${VERSION:-1.7.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,6 +76,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 {} \; +# xfce4-terminal.wrapper is a Debian specific script that Slackware does not provide +# Patch taken from the Arch Linux repo: +# https://gitlab.archlinux.org/archlinux/packaging/packages/rofi/-/blob/main/fix_xfce4-terminal_binary_name.patch +patch -p1 < $CWD/fix_xfce4-terminal_binary_name.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/rofi/rofi.info b/desktop/rofi/rofi.info index 98d96c2441..d5c3d6e2de 100644 --- a/desktop/rofi/rofi.info +++ b/desktop/rofi/rofi.info @@ -1,8 +1,8 @@ PRGNAM="rofi" -VERSION="1.7.5" +VERSION="1.7.9.1" HOMEPAGE="https://github.com/DaveDavenport/rofi/" -DOWNLOAD="https://github.com/davatorium/rofi/releases/download/1.7.5/rofi-1.7.5.tar.xz" -MD5SUM="284aea347005af52354a6a8c492a8c03" +DOWNLOAD="https://github.com/davatorium/rofi/releases/download/1.7.9.1/rofi-1.7.9.1.tar.xz" +MD5SUM="421f04b75236ffddb5818dd204dd15b0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="xcb-util-xrm" diff --git a/desktop/sway/sway.SlackBuild b/desktop/sway/sway.SlackBuild index 82f6f4f157..39d3d6ca72 100644 --- a/desktop/sway/sway.SlackBuild +++ b/desktop/sway/sway.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sway -VERSION=${VERSION:-1.7} +VERSION=${VERSION:-1.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -94,7 +94,6 @@ cd build -Dstrip=true \ -Ddefault-wallpaper=true \ -Dswaybar=true \ - -Dxwayland=enabled \ -Dtray=enabled \ -Dgdk-pixbuf=enabled \ -Dswaynag=true \ diff --git a/desktop/sway/sway.info b/desktop/sway/sway.info index e634acedd8..2565b3d5e9 100644 --- a/desktop/sway/sway.info +++ b/desktop/sway/sway.info @@ -1,8 +1,8 @@ PRGNAM="sway" -VERSION="1.7" +VERSION="1.11" HOMEPAGE="https://swaywm.org/" -DOWNLOAD="https://github.com/swaywm/sway/archive/v1.7/sway-1.7.tar.gz" -MD5SUM="fa6316f217d869cf0859adece8c3f745" +DOWNLOAD="https://github.com/swaywm/sway/releases/download/1.11/sway-1.11.tar.gz" +MD5SUM="798ff1172e8ddb906191116453a1b24b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wlroots swaybg" diff --git a/desktop/swaybg/swaybg.SlackBuild b/desktop/swaybg/swaybg.SlackBuild index 59d951522e..dea90f58be 100644 --- a/desktop/swaybg/swaybg.SlackBuild +++ b/desktop/swaybg/swaybg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=swaybg -VERSION=${VERSION:-1.1.1} +VERSION=${VERSION:-1.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/swaybg/swaybg.info b/desktop/swaybg/swaybg.info index 721150c7a6..baa21c5e82 100644 --- a/desktop/swaybg/swaybg.info +++ b/desktop/swaybg/swaybg.info @@ -1,8 +1,8 @@ PRGNAM="swaybg" -VERSION="1.1.1" +VERSION="1.2.1" HOMEPAGE="https://github.com/swaywm/swaybg" -DOWNLOAD="https://github.com/swaywm/swaybg/releases/download/v1.1.1/swaybg-1.1.1.tar.gz" -MD5SUM="c6578aaef4b0d198e7f8dfa855eea6a2" +DOWNLOAD="https://github.com/swaywm/swaybg/releases/download/v1.2.1/swaybg-1.2.1.tar.gz" +MD5SUM="a0228fadd684cd778d46b70756088178" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="scdoc" diff --git a/desktop/tint2/tint2.SlackBuild b/desktop/tint2/tint2.SlackBuild index 8f439e3cb2..722c94a418 100644 --- a/desktop/tint2/tint2.SlackBuild +++ b/desktop/tint2/tint2.SlackBuild @@ -73,12 +73,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/tint2conf-libm-1082699.patch + mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/desktop/tint2/tint2conf-libm-1082699.patch b/desktop/tint2/tint2conf-libm-1082699.patch new file mode 100644 index 0000000000..27ff466e2c --- /dev/null +++ b/desktop/tint2/tint2conf-libm-1082699.patch @@ -0,0 +1,16 @@ +Description: tint2conf also uses libm + +Bug-Debian: https://bugs.debian.org/1082699 +Forwarded: no +Last-Update: 2024-12-18 + +--- tint2-17.0.1.orig/src/tint2conf/CMakeLists.txt ++++ tint2-17.0.1/src/tint2conf/CMakeLists.txt +@@ -65,6 +65,7 @@ target_link_libraries( tint2conf ${X11_T + ${GTHREAD2_LIBRARIES} + ${GTK3_LIBRARIES} + ${RSVG_LIBRARIES} ) ++target_link_libraries( tint2conf m ) + + add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" ) + add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_FULL_LOCALEDIR}\" ) diff --git a/desktop/trayer-srg/trayer-srg.SlackBuild b/desktop/trayer-srg/trayer-srg.SlackBuild index 5901b2e2de..abfc9ca2d1 100644 --- a/desktop/trayer-srg/trayer-srg.SlackBuild +++ b/desktop/trayer-srg/trayer-srg.SlackBuild @@ -99,7 +99,7 @@ patch -p1 < $CWD/spelling_grammar_fixes.diff # not a real (autotools) configure script, notice non-canonical use # of --prefix here! ./configure --prefix=/usr/bin -CFLAGS="$SLKCFLAGS" make # This will also strip the executable +CFLAGS="$SLKCFLAGS -std=gnu17" make # This will also strip the executable # Instead of patching the Makefile, let's install it manually: mkdir -p $PKG/usr/bin diff --git a/desktop/waybar/66b71cc8577d1296323b637afc89524a00779776.patch.gz b/desktop/waybar/66b71cc8577d1296323b637afc89524a00779776.patch.gz deleted file mode 100644 index 15dfaafa0b045ebbadbf6bcf0f3b9219deaef298..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 713 zcmV;)0yh00iwFn_+h%4012#5dH!)*lI5jsnWHB;1HZw9aVm323VP<1EIW;mgVK6W^ zH#s*qHZE{sbYo}$wUTXX+b|Hv-|JHx47!BWjvtcP@k(jeEgOSDp=EEz2(oleRBYK; za+|XCyYK8ITQcyr!UjgR?%{uTzTcuQ3lMP-Mw2j-L6q@eI?X0B=3(qf6f>E|Q6T+r zj**0qrG^`mQ5lJ0@P^L(}-nFKy?4c9zx44mCn?fW9*#ui-Vt|*Ih_J&(b;I_e2 z@TYLutSC7M=}4wg;zcm>NQ~Vy=^YB2z~}4B+pG6q;O(Z$l~6W+1VMVx7+Wj70$alF z>tT%=DsIfqoE4TaS?ZS-YNRx3TNPUo5T(Ay+9w;T%T~z?zAb=4Cm|BdBQZ_l7vC(R* zEEcYyhKD;k22`x;35JWOec z8`@hsQ zGJ$eb;{@&rNkZ=^^8|$545^Ak3IvO7YTeUHlI+BHI&I=BHv0QKW4Tpg*)n_-uoWEc z6-n=j!4rKv0gT7cj%z9|up{yaf?mkdUe^wTxePNgNoDN1apcbeKTD%y40;8&9Q3+d z5Q3lup*!ii-+f{Czv3qVpLngfwy(Lt{|doDoj-uk?h{l717(&KmA5?2akru$pgao| vx04wRkC6E{(CnoT;URngbA$U?p4aON?Xvy9%dLCxi!%ET&?XB;F$MqtvHnwg diff --git a/desktop/waybar/waybar.SlackBuild b/desktop/waybar/waybar.SlackBuild index f5f0ed01f9..5887599e8a 100644 --- a/desktop/waybar/waybar.SlackBuild +++ b/desktop/waybar/waybar.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=waybar SRCNAM=Waybar -VERSION=${VERSION:-0.9.20} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.14.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -68,9 +68,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z cd $SRCNAM-$VERSION -zcat $CWD/66b71cc8577d1296323b637afc89524a00779776.patch.gz | patch -p1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -81,7 +80,7 @@ find -L . \ mkdir build cd build CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS -fpermissive" \ meson .. \ --buildtype=release \ --infodir=/usr/info \ @@ -99,7 +98,6 @@ cd build -Dsystemd=disabled \ -Ddbusmenu-gtk=auto \ -Dmpd=auto \ - -Dgtk-layer-shell=auto \ -Drfkill=auto \ -Dsndio=disabled \ -Dtests=disabled \ diff --git a/desktop/waybar/waybar.info b/desktop/waybar/waybar.info index 6c16a84b42..87eb320f77 100644 --- a/desktop/waybar/waybar.info +++ b/desktop/waybar/waybar.info @@ -1,8 +1,8 @@ PRGNAM="waybar" -VERSION="0.9.20" +VERSION="0.14.0" HOMEPAGE="https://github.com/Alexays/Waybar" -DOWNLOAD="https://github.com/Alexays/Waybar/archive/0.9.20/Waybar-0.9.20.tar.gz" -MD5SUM="3c736fb5a28b14ed327e72e93f193cdf" +DOWNLOAD="https://github.com/Alexays/Waybar/archive/0.14.0/Waybar-0.14.0.tar.gz" +MD5SUM="7d413dd64391933f8b8eb37eb29dbce0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jsoncpp scdoc spdlog date gtk-layer-shell" diff --git a/desktop/wmCalClock/1.26-fix-KnR-prototypes.patch b/desktop/wmCalClock/1.26-fix-KnR-prototypes.patch new file mode 100644 index 0000000000..f6f6284f59 --- /dev/null +++ b/desktop/wmCalClock/1.26-fix-KnR-prototypes.patch @@ -0,0 +1,43 @@ +diff --git a/Src/wmCalClock.c b/Src/wmCalClock.c +index 4ba7780..6365e92 100644 +--- a/Src/wmCalClock.c ++++ b/Src/wmCalClock.c +@@ -124,6 +124,8 @@ void ParseCMDLine(int argc, char *argv[]); + void ButtonPressEvent(XButtonEvent *); + void print_usage(); + ++double hour24(double hour); ++double jd(int ny, int nm, int nd, double UT); + + + +@@ -310,7 +312,7 @@ int main(int argc, char *argv[]) { + int Year, Month, DayOfWeek, DayOfMonth, OldDayOfMonth; + int Hours, Mins, Secs, OldSecs, digit, xoff, D[10], xsize; + time_t CurrentLocalTime; +- double UT, TU, TU2, TU3, T0, gmst, jd(), hour24(); ++ double UT, TU, TU2, TU3, T0, gmst; + + + /* +@@ -939,9 +941,7 @@ void print_usage(){ + * Compute the Julian Day number for the given date. + * Julian Date is the number of days since noon of Jan 1 4713 B.C. + */ +-double jd(ny, nm, nd, UT) +-int ny, nm, nd; +-double UT; ++double jd(int ny, int nm, int nd, double UT) + { + double A, B, C, D, JD, day; + +@@ -976,8 +976,7 @@ double UT; + + } + +-double hour24(hour) +-double hour; ++double hour24(double hour) + { + int n; + diff --git a/desktop/wmCalClock/wmCalClock.SlackBuild b/desktop/wmCalClock/wmCalClock.SlackBuild index f012e20c50..25f12b1664 100644 --- a/desktop/wmCalClock/wmCalClock.SlackBuild +++ b/desktop/wmCalClock/wmCalClock.SlackBuild @@ -8,7 +8,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wmCalClock -VERSION=${VERSION:-1.25} +SRCNAM=wmcalclock +VERSION=${VERSION:-1.26} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -21,9 +22,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -52,24 +50,32 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar -xvf $CWD/$SRCNAM-$VERSION.tar.?z +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -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 {} \; - -cd Src - make \ - CFLAGS="$SLKCFLAGS -fcommon" \ - INCDIR="-I/usr/include/X11" \ - LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" - mkdir -p $PKG/usr/{bin,man/man1} - make install DESTDIR=$PKG/usr -cd - + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -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/1.26-fix-KnR-prototypes.patch + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --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 diff --git a/desktop/wmCalClock/wmCalClock.info b/desktop/wmCalClock/wmCalClock.info index c7889bf664..e4b980ec43 100644 --- a/desktop/wmCalClock/wmCalClock.info +++ b/desktop/wmCalClock/wmCalClock.info @@ -1,8 +1,8 @@ PRGNAM="wmCalClock" -VERSION="1.25" -HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/wmCalClock-1.25.tar.gz" -MD5SUM="a401ded0e1fee4bcc4623076159bca41" +VERSION="1.26" +HOMEPAGE="https://www.dockapps.net/wmcalclock" +DOWNLOAD="https://www.dockapps.net/download/wmcalclock-1.26.tar.xz" +MD5SUM="8e26e4ccd1809c182bc44ca7dad5ee84" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/wmMoonClock/wmMoonClock.SlackBuild b/desktop/wmMoonClock/wmMoonClock.SlackBuild index ad279b4d47..4fb2026e63 100644 --- a/desktop/wmMoonClock/wmMoonClock.SlackBuild +++ b/desktop/wmMoonClock/wmMoonClock.SlackBuild @@ -8,8 +8,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wmMoonClock -VERSION=${VERSION:-1.27} -BUILD=${BUILD:-2} +SRCNAM=wmmoonclock +VERSION=${VERSION:-1.30} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -21,9 +22,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -52,33 +50,36 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -patch -p0 < $CWD/SouthernHemisphere.patch -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -cd Src - mkdir -p $PKG/usr/{bin,man/man1} - make \ - CFLAGS="$SLKCFLAGS -fcommon" \ - INCDIR="-I/usr/include/X11" \ - LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" - make install DESTDIR=$PKG/usr -cd - + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -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 -std=gnu17" \ +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 | 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 -) +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 BUGS COPYING $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/desktop/wmMoonClock/wmMoonClock.info b/desktop/wmMoonClock/wmMoonClock.info index 4d8470586d..e0d4d106ed 100644 --- a/desktop/wmMoonClock/wmMoonClock.info +++ b/desktop/wmMoonClock/wmMoonClock.info @@ -1,8 +1,8 @@ PRGNAM="wmMoonClock" -VERSION="1.27" -HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmmoonclock" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/wmMoonClock-1.27.tar.gz" -MD5SUM="c85bc974e70c867d556805505d3be48c" +VERSION="1.30" +HOMEPAGE="https://www.dockapps.net/wmmoonclock" +DOWNLOAD="https://www.dockapps.net/download/wmmoonclock-1.30.tar.gz" +MD5SUM="c5b02d3d26d42e9472edd215c4633127" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/wmSun/wmSun.SlackBuild b/desktop/wmSun/wmSun.SlackBuild index 810df47905..33365db3f0 100644 --- a/desktop/wmSun/wmSun.SlackBuild +++ b/desktop/wmSun/wmSun.SlackBuild @@ -21,9 +21,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -65,7 +62,7 @@ find -L . \ cd wmSun mkdir -p $PKG/usr/{bin,man/man1} make \ - COPTS="$SLKCFLAGS -fcommon" \ + COPTS="$SLKCFLAGS -fcommon -fpermissive -std=gnu17" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" make install DESTDIR=$PKG/usr diff --git a/desktop/wmSunMoon/wmSunMoon.SlackBuild b/desktop/wmSunMoon/wmSunMoon.SlackBuild index 4ec61ff6b1..a30246ab1f 100644 --- a/desktop/wmSunMoon/wmSunMoon.SlackBuild +++ b/desktop/wmSunMoon/wmSunMoon.SlackBuild @@ -21,9 +21,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -65,7 +62,7 @@ find -L . \ cd wmSunMoon mkdir -p $PKG/usr/{bin,man/man1,,man/man7,doc/$PRGNAM-$VERSION} make \ - COPTS="$SLKCFLAGS -fcommon" \ + COPTS="$SLKCFLAGS -fcommon -fpermissive -std=gnu17" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" cp -a wmSunMoon $PKG/usr/bin diff --git a/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.SlackBuild b/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.SlackBuild index 0beeeb2d74..1c8c9d7f81 100644 --- a/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.SlackBuild +++ b/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.SlackBuild @@ -29,8 +29,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xdg-desktop-portal-gtk -VERSION=${VERSION:-1.4.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.15.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,19 +80,22 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -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 build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + -Dstrip=true + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.info b/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.info index f2343973a2..e26b150eac 100644 --- a/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.info +++ b/desktop/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk.info @@ -1,10 +1,10 @@ PRGNAM="xdg-desktop-portal-gtk" -VERSION="1.4.0" +VERSION="1.15.3" HOMEPAGE="https://flatpak.org/" -DOWNLOAD="https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.4.0/xdg-desktop-portal-gtk-1.4.0.tar.xz" -MD5SUM="aaecbb1e91621423ae61b12b4d2a5e79" +DOWNLOAD="https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.15.3/xdg-desktop-portal-gtk-1.15.3.tar.xz" +MD5SUM="2d6e2ad2953c386a1db11618fa3803b0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="gnome-desktop" MAINTAINER="Vincent Batts" EMAIL="vbatts@hashbangbash.com" diff --git a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild index f075e52868..b2484290c4 100644 --- a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild +++ b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xfce4-cpugraph-plugin -VERSION=${VERSION:-1.2.6} +VERSION=${VERSION:-1.2.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info index e12ac4a63b..a0837ac60c 100644 --- a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info +++ b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-cpugraph-plugin" -VERSION="1.2.6" +VERSION="1.2.7" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.6.tar.bz2" -MD5SUM="5598a55557cd03583b1867432dc51039" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.7.tar.bz2" +MD5SUM="0480611899650e2d4304d13e0e0dda77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild index 9486471dbb..260088327d 100644 --- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild +++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xfce4-sensors-plugin -VERSION=${VERSION:-1.4.3} +VERSION=${VERSION:-1.4.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info index 67196fa56a..d3d9fb0eb8 100644 --- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info +++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-sensors-plugin" -VERSION="1.4.3" +VERSION="1.4.4" HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.3.tar.bz2" -MD5SUM="e55dfea49b0c5e9edf068db3b8398240" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.4.tar.bz2" +MD5SUM="0684f0f86e2edfb306086445478f7bbd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild b/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild index 053a4b0cde..5edc9c0e82 100644 --- a/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild +++ b/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild @@ -83,6 +83,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 -e "s|XDT_CHECK_PACKAGE(\[GLIB\], \[glib-2.0\], \[2.16\])|XDT_CHECK_PACKAGE(\[GLIB\], \[glib-2.0\], \[2.26\])|" configure.ac.in + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/xfce4-xkb-plugin/README b/desktop/xfce4-xkb-plugin/README deleted file mode 100644 index f9e2065b11..0000000000 --- a/desktop/xfce4-xkb-plugin/README +++ /dev/null @@ -1,2 +0,0 @@ -xfce4-xkb-plugin can be used to show the current keyboard layout and/or -to select a layout from those defined in the /etc/X11/xorg.conf file. diff --git a/desktop/xfce4-xkb-plugin/slack-desc b/desktop/xfce4-xkb-plugin/slack-desc deleted file mode 100644 index 683b1bf608..0000000000 --- a/desktop/xfce4-xkb-plugin/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -xfce4-xkb-plugin: xfce4-xkb-plugin (xkb plugin for the Xfce panel) -xfce4-xkb-plugin: -xfce4-xkb-plugin: The xkb plugin can be used to show the current keyboard layout and/or -xfce4-xkb-plugin: to select a layout from those defined in the /etc/X11/xorg.conf file. -xfce4-xkb-plugin: -xfce4-xkb-plugin: homepage: https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin -xfce4-xkb-plugin: -xfce4-xkb-plugin: -xfce4-xkb-plugin: -xfce4-xkb-plugin: -xfce4-xkb-plugin: diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild deleted file mode 100644 index 3df30b7d9a..0000000000 --- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -# Slackware build script for xfce4-xkb-plugin - -# Copyright 2006-2021 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=xfce4-xkb-plugin -VERSION=${VERSION:-0.8.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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/xfce \ - --enable-shared=yes \ - --enable-static=no \ - --enable-debug=no \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info deleted file mode 100644 index 0df8049bcf..0000000000 --- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="xfce4-xkb-plugin" -VERSION="0.8.2" -HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.8/xfce4-xkb-plugin-0.8.2.tar.bz2" -MD5SUM="8e10f98a44082a2df6a997caab9a0b21" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/desktop/xss-lock/xss-lock.SlackBuild b/desktop/xss-lock/xss-lock.SlackBuild index c38a6a19fb..616dc67398 100644 --- a/desktop/xss-lock/xss-lock.SlackBuild +++ b/desktop/xss-lock/xss-lock.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xss-lock -# Copyright 2021-2022 K. Eugene Carlson Tsukuba, Japan +# Copyright 2021-2025 K. Eugene Carlson Tsukuba, Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xss-lock VERSION=${VERSION:-0.3.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -85,6 +85,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_STRIP=/usr/bin/strip \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/desktop/zenity/README b/desktop/zenity/README index 125286c90e..79ad864834 100644 --- a/desktop/zenity/README +++ b/desktop/zenity/README @@ -4,7 +4,8 @@ similar to the classic `dialog` program, but with a GUI interface. OPTIONAL DEPENDENCIES: -* webkit2gtk-4.1 +* webkit2gtk-6.0 (ie, webkitgtk for gtk4; NOT yet part of sbo-ponce as + of 2024-07-28) To enable: pass `WEBKITGTK=true` as an option to the slackbuild. If this is not specified, it will default to `false`. diff --git a/desktop/zenity/zenity.SlackBuild b/desktop/zenity/zenity.SlackBuild index f0efbc5a67..2a84a3636d 100644 --- a/desktop/zenity/zenity.SlackBuild +++ b/desktop/zenity/zenity.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=zenity -VERSION=${VERSION:-3.44.5} +VERSION=${VERSION:-4.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,27 +79,24 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# nb: libnotify is enabled by default as it is included in slackware. -# webkitgtk is an optional dependency (NOT included in slackware) which may be -# enabled upon request. +# webkitgtk is an optional dependency (NOT included in slackware or even +# sbo-ponce as yet; see README) which may be enabled upon request. mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dlibnotify=true \ - -Dwebkitgtk=${WEBKITGTK:-false} - ninja - DESTDIR=$PKG ninja install -cd .. +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +meson setup \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + -Dwebkitgtk=${WEBKITGTK:-false} \ + build/ +ninja -v -C build/ +DESTDIR=$PKG ninja -v -C build/ install find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/desktop/zenity/zenity.info b/desktop/zenity/zenity.info index c32ae1081e..5cd4c8868e 100644 --- a/desktop/zenity/zenity.info +++ b/desktop/zenity/zenity.info @@ -1,10 +1,10 @@ PRGNAM="zenity" -VERSION="3.44.5" +VERSION="4.0.2" HOMEPAGE="https://gitlab.gnome.org/GNOME/zenity" -DOWNLOAD="https://download.gnome.org/sources/zenity/3.44/zenity-3.44.5.tar.xz" -MD5SUM="69f4a4fdce7217231207019a6e27636b" +DOWNLOAD="https://download.gnome.org/sources/zenity/4.0/zenity-4.0.2.tar.xz" +MD5SUM="08ba19bb3fe5c180402690d5c40c6cc3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="libadwaita" MAINTAINER="Logan Rathbone" EMAIL="poprocks@gmail.com" diff --git a/development/Bear/Bear.SlackBuild b/development/Bear/Bear.SlackBuild index 16f3fe79b6..afc2d794aa 100644 --- a/development/Bear/Bear.SlackBuild +++ b/development/Bear/Bear.SlackBuild @@ -75,6 +75,10 @@ cd "$PRGNAM-$VERSION" chown -R root:root . chmod -R u+w,go+r-w,a-s . +# -current Fixes +sed -i '0,/#include $/a #include ' \ + source/citnames/source/semantic/{Parsers.h,Semantic.cc} + mkdir -p $TMP/$PRGNAM-build cd $TMP/$PRGNAM-build diff --git a/development/Coin/Coin.SlackBuild b/development/Coin/Coin.SlackBuild index cac32c1f2c..c7339fc570 100644 --- a/development/Coin/Coin.SlackBuild +++ b/development/Coin/Coin.SlackBuild @@ -84,6 +84,7 @@ cd coin_build -DCMAKE_INSTALL_PREFIX=/usr \ -DCOIN_BUILD_DOCUMENTATION=ON \ -DCOIN_BUILD_DOCUMENTATION_MAN=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/development/OpenCL-CLHPP/OpenCL-CLHPP.SlackBuild b/development/OpenCL-CLHPP/OpenCL-CLHPP.SlackBuild index 05f7f11b28..37e5f0bb12 100644 --- a/development/OpenCL-CLHPP/OpenCL-CLHPP.SlackBuild +++ b/development/OpenCL-CLHPP/OpenCL-CLHPP.SlackBuild @@ -72,6 +72,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_EXAMPLES=OFF \ -DBUILD_TESTING=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/development/Pivy/Pivy.SlackBuild b/development/Pivy/Pivy.SlackBuild index 33bb3fddf9..5f5685dc00 100644 --- a/development/Pivy/Pivy.SlackBuild +++ b/development/Pivy/Pivy.SlackBuild @@ -83,6 +83,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 -e 's/PyUnicode_GET_SIZE/PyUnicode_GET_LENGTH/' Inventor/SoInput.i + mkdir build cd build cmake \ @@ -90,6 +92,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/development/SoQt/SoQt.SlackBuild b/development/SoQt/SoQt.SlackBuild index 488c066fc9..f0f443cf40 100644 --- a/development/SoQt/SoQt.SlackBuild +++ b/development/SoQt/SoQt.SlackBuild @@ -80,6 +80,7 @@ cd soqt_build -DCMAKE_INSTALL_PREFIX=/usr \ -DSOQT_BUILD_DOCUMENTATION=ON \ -DSOQT_BUILD_DOC_MAN=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/development/Sphinx/README b/development/Sphinx/README deleted file mode 100644 index e3f923a7f7..0000000000 --- a/development/Sphinx/README +++ /dev/null @@ -1,5 +0,0 @@ -Sphinx is a tool that translates a set of reStructuredText -source files into various output formats, including HTML, ePub, -LaTeX and plain text. Sphinx was originally created for the Python -documentation, but it has excellent facilities for the documentation -of software projects in a range of languages. diff --git a/development/Sphinx/Sphinx.SlackBuild b/development/Sphinx/Sphinx.SlackBuild deleted file mode 100644 index 330564c274..0000000000 --- a/development/Sphinx/Sphinx.SlackBuild +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash - -# Slackware build script for Sphinx - -# Copyright 2023-2024 fourtysixandtwo -# Copyright 2013 Mikko Värri, Finland -# Copyright 2017-2021 Benjamin Trigona-Harany -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=Sphinx -SRCNAM=Sphinx -VERSION=${VERSION:-5.3.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -# lower Pygments required version -sed -i '/Pygments>=/ s/2.12/2.10.0/' pyproject.toml - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -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 CHANGES EXAMPLES LICENSE README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/Sphinx/Sphinx.info b/development/Sphinx/Sphinx.info deleted file mode 100644 index 9d05ca57e9..0000000000 --- a/development/Sphinx/Sphinx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="Sphinx" -VERSION="5.3.0" -HOMEPAGE="http://www.sphinx-doc.org" -DOWNLOAD="https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-5.3.0.tar.gz" -MD5SUM="b752f7b0177865a36cbcdcef4ac80cd4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="alabaster imagesize python3-babel snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp sphinxcontrib-htmlhelp sphinxcontrib-jsmath sphinxcontrib-qthelp sphinxcontrib-serializinghtml python-importlib_metadata" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/development/Sphinx/slack-desc b/development/Sphinx/slack-desc deleted file mode 100644 index 403648f0ae..0000000000 --- a/development/Sphinx/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -Sphinx: Sphinx (Documentation generator) -Sphinx: -Sphinx: Sphinx is a tool that translates a set of reStructuredText source -Sphinx: files into various output formats, including HTML, ePub, LaTeX and -Sphinx: plain text. Sphinx was originally created for the Python -Sphinx: documentation, but it has excellent facilities for the documentation -Sphinx: of software projects in a range of languages. -Sphinx: -Sphinx: -Sphinx: -Sphinx: diff --git a/development/UASM/UASM.SlackBuild b/development/UASM/UASM.SlackBuild index 0825c00adf..7a654c6bc4 100644 --- a/development/UASM/UASM.SlackBuild +++ b/development/UASM/UASM.SlackBuild @@ -71,7 +71,7 @@ rm -rf $SRC_DIR tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $SRC_DIR -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive -std=gnu17" \ CXXFLAGS="$SLKCFLAGS" \ make CC="gcc -fcommon" -f Makefile-Linux-GCC-64.mak # Don't ship .la files: diff --git a/development/abseil-cpp/README b/development/abseil-cpp/README deleted file mode 100644 index b1b90760e1..0000000000 --- a/development/abseil-cpp/README +++ /dev/null @@ -1,2 +0,0 @@ -Abseil is an open-source collection of C++ code designed to augment the -C++ standard library. diff --git a/development/abseil-cpp/abseil-cpp.SlackBuild b/development/abseil-cpp/abseil-cpp.SlackBuild deleted file mode 100644 index 3fde144842..0000000000 --- a/development/abseil-cpp/abseil-cpp.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash - -# Slackware build script for abseil-cpp - -# Copyright 2024 Isaac Yu -# Copyright 2025 Jeremy Hansen -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=abseil-cpp -VERSION=${VERSION:-20250814.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -else - SLKCFLAGS="-O2" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DNDEBUG" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_CXX_STANDARD=17 \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CONTRIBUTING.md FAQ.md LICENSE README.md UPGRADES.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/abseil-cpp/abseil-cpp.info b/development/abseil-cpp/abseil-cpp.info deleted file mode 100644 index cb39d1844b..0000000000 --- a/development/abseil-cpp/abseil-cpp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="abseil-cpp" -VERSION="20250814.1" -HOMEPAGE="https://abseil.io" -DOWNLOAD="https://github.com/abseil/abseil-cpp/archive/20250814.1/abseil-cpp-20250814.1.tar.gz" -MD5SUM="d4d3c25f78e28d61ad83e54cd1116933" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/development/abseil-cpp/slack-desc b/development/abseil-cpp/slack-desc deleted file mode 100644 index cd4106eb18..0000000000 --- a/development/abseil-cpp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -abseil-cpp: abseil-cpp (Abseil C++ Common Libraries) -abseil-cpp: -abseil-cpp: Abseil is an open-source collection of C++ code designed to augment -abseil-cpp: the C++ standard library. -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: diff --git a/development/avr-gdb/avr-gdb.SlackBuild b/development/avr-gdb/avr-gdb.SlackBuild index 0197b6eca9..e734b0e233 100644 --- a/development/avr-gdb/avr-gdb.SlackBuild +++ b/development/avr-gdb/avr-gdb.SlackBuild @@ -62,6 +62,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 -d ../ < $CWD/fix-const-compile.patch + CFLAGS_FOR_BUILD="$SLKCFLAGS" \ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \ ../gdb-$VERSION/configure \ diff --git a/development/avr-gdb/fix-const-compile.patch b/development/avr-gdb/fix-const-compile.patch new file mode 100644 index 0000000000..c5d87fee84 --- /dev/null +++ b/development/avr-gdb/fix-const-compile.patch @@ -0,0 +1,11 @@ +--- a/gdb-10.1/gdb/completer.c 2020-10-23 23:23:02.000000000 -0500 ++++ b/gdb-10.1/gdb/completer.c 2025-04-04 10:57:08.321138688 -0500 +@@ -2036,7 +2036,7 @@ + rl_basic_quote_characters = NULL; + } + +- return rl_completer_word_break_characters; ++ return (char *)rl_completer_word_break_characters; + } + + char * diff --git a/development/bazel/abseil-missing-stdint.patch b/development/bazel/abseil-missing-stdint.patch new file mode 100644 index 0000000000..725a8925a3 --- /dev/null +++ b/development/bazel/abseil-missing-stdint.patch @@ -0,0 +1,10 @@ +--- abseil-cpp.orig/absl/strings/internal/str_format/extension.h ++++ abseil-cpp/absl/strings/internal/str_format/extension.h +@@ -26,6 +26,7 @@ + #include "absl/base/port.h" + #include "absl/meta/type_traits.h" + #include "absl/strings/internal/str_format/output.h" ++#include + #include "absl/strings/string_view.h" + + namespace absl { diff --git a/development/bazel/apply-abseil-stdint.patch b/development/bazel/apply-abseil-stdint.patch new file mode 100644 index 0000000000..b5065aa1b6 --- /dev/null +++ b/development/bazel/apply-abseil-stdint.patch @@ -0,0 +1,13 @@ +--- distdir_deps.bzl.orig 2023-09-05 16:10:13.000617742 +0900 ++++ distdir_deps.bzl 2023-09-05 16:10:42.471484181 +0900 +@@ -163,6 +163,10 @@ + }, + "com_google_absl": { + "archive": "20211102.0.tar.gz", ++ "patch_args": ["-p1"], ++ "patches": [ ++ "//:abseil-missing-stdint.patch" ++ ], + "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + "urls": [ + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", diff --git a/development/bazel/bazel.SlackBuild b/development/bazel/bazel.SlackBuild index 511270c48f..751fd9cc27 100644 --- a/development/bazel/bazel.SlackBuild +++ b/development/bazel/bazel.SlackBuild @@ -72,6 +72,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 {} \; +# Missing include. +patch -p0 < $CWD/apply-abseil-stdint.patch +cp $CWD/abseil-missing-stdint.patch . + # Export environmental variables # Please change JAVA_HOME if not using zulu-openjdk21 export JAVA_HOME=/usr/lib$LIBDIRSUFFIX/zulu-openjdk21 diff --git a/development/bluefish/README b/development/bluefish/README index cc4ba079d9..52c0785c7e 100644 --- a/development/bluefish/README +++ b/development/bluefish/README @@ -13,9 +13,3 @@ otherwise GTK3 will be used by default. js-beautify is an optional run-time dependency used if installed (not available on Slackbuilds.org). - -NOTE: -This is the last version compatible with 15.0. -Never versions will require glib >= 2.76 - - diff --git a/development/bluefish/bluefish.SlackBuild b/development/bluefish/bluefish.SlackBuild index aa2b624784..2d63001f04 100644 --- a/development/bluefish/bluefish.SlackBuild +++ b/development/bluefish/bluefish.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bluefish -VERSION=${VERSION:-2.2.16} +VERSION=${VERSION:-2.2.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -88,7 +85,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-implicit-function-declaration" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/development/bluefish/bluefish.info b/development/bluefish/bluefish.info index a0a1cf0d0a..292cc95c84 100644 --- a/development/bluefish/bluefish.info +++ b/development/bluefish/bluefish.info @@ -1,8 +1,8 @@ PRGNAM="bluefish" -VERSION="2.2.16" +VERSION="2.2.17" HOMEPAGE="http://bluefish.openoffice.nl/index.html" -DOWNLOAD="https://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.16.tar.bz2" -MD5SUM="6982e68b978777b7eac16c97bd7af834" +DOWNLOAD="https://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.17.tar.bz2" +MD5SUM="7b19a3691c7c5787e98174e58bd6d652" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/cJSON/cJSON.SlackBuild b/development/cJSON/cJSON.SlackBuild index b2484bcb06..f19fa92f12 100644 --- a/development/cJSON/cJSON.SlackBuild +++ b/development/cJSON/cJSON.SlackBuild @@ -85,6 +85,7 @@ cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/development/cargo-c/README b/development/cargo-c/README deleted file mode 100644 index 889afa81fd..0000000000 --- a/development/cargo-c/README +++ /dev/null @@ -1,7 +0,0 @@ -cargo-c is an extension for Cargo, the Rust package manager, that -helps to build and install C-ABI compatible dynamic and static -libraries. It produces and installs a correct pkg-config file, a -static library and a dynamic library, and a C header to be used -by any C (and C-compatible) software. - -rust-opt is needed only at build time. diff --git a/development/cargo-c/cargo-c.SlackBuild b/development/cargo-c/cargo-c.SlackBuild deleted file mode 100644 index 14ad20886d..0000000000 --- a/development/cargo-c/cargo-c.SlackBuild +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/bash - -# Slackware build script for cargo-c - -# Copyright 2023-2024, Alexander Verbovetsky, Moscow, Russia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=cargo-c -VERSION=${VERSION:-0.10.4} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac - - if [ "$ARCH" = "i586" ]; then - if LD_LIBRARY_PATH="/opt/rust/lib" /opt/rust/bin/rustc -Vv \ - | grep host | grep i686 > /dev/null ; then - ARCH=i686 - fi - fi -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" - CARGOTARGET="--target i586-unknown-linux-gnu" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" - CARGOTARGET="--target i686-unknown-linux-gnu" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - CARGOTARGET="--target x86_64-unknown-linux-gnu" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - CARGOTARGET="" -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 -cp $CWD/Cargo.lock . - -mkdir .cargo -cat << EOF >> .cargo/config -[source.crates-io] -registry = 'https://github.com/rust-lang/crates.io-index' -replace-with = 'vendored-sources' - -[source.vendored-sources] -directory = '$(pwd)/vendor' -EOF - -mkdir vendor -( - cd vendor - - grep -h -A 4 "\[\[package\]\]" \ - $(find "../" -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ - sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ - awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4, $5 }' | \ - sed 's/"//g;s/name=//;s/ version=/=/' | \ - grep " source=" | \ - sed 's/ dependencies=.*$//' | \ - sed 's/ source=[^ ]*//' | \ - sed 's/ checksum=/=/' | \ - sort -u | \ - while read -r dep ; do - - cksum="$(printf "%s\n" "$dep" | cut -d= -f3)" - ver="$(printf "%s\n" "$dep" | cut -d= -f2)" - dep="$(printf "%s\n" "$dep" | cut -d= -f1)" - - tar xvf $CWD/$dep-$ver.crate - - touch $dep-$ver/.cargo-ok - - { - printf "{\n" - printf ' "files": {\n' - - ( - cd $dep-$ver - find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/' - ) | sed '$ s/,$//' - - printf " },\n" - printf ' "package": "%s"' "$cksum" - - printf "}\n" - } > $dep-$ver/.cargo-checksum.json - done -) - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CARGO_HOME=.cargo \ -PATH="/opt/rust/bin:$PATH" \ -LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -cargo build --offline --release $CARGOTARGET -PATH="/opt/rust/bin:$PATH" \ -LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" \ -cargo install --offline --no-track --root "${PKG}/usr" --path="." - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/cargo-c/cargo-c.info b/development/cargo-c/cargo-c.info deleted file mode 100644 index 459bb5a3b1..0000000000 --- a/development/cargo-c/cargo-c.info +++ /dev/null @@ -1,678 +0,0 @@ -PRGNAM="cargo-c" -VERSION="0.10.4" -HOMEPAGE="https://github.com/lu-zero/cargo-c/" -DOWNLOAD="https://github.com/lu-zero/cargo-c/archive/v0.10.4/cargo-c-0.10.4.tar.gz \ - https://github.com/lu-zero/cargo-c/releases/download/v0.10.4/Cargo.lock \ - https://static.crates.io/crates/adler2/adler2-2.0.0.crate \ - https://static.crates.io/crates/ahash/ahash-0.8.11.crate \ - https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.3.crate \ - https://static.crates.io/crates/allocator-api2/allocator-api2-0.2.18.crate \ - https://static.crates.io/crates/annotate-snippets/annotate-snippets-0.11.4.crate \ - https://static.crates.io/crates/anstream/anstream-0.6.15.crate \ - https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.5.crate \ - https://static.crates.io/crates/anstyle-query/anstyle-query-1.1.1.crate \ - https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.4.crate \ - https://static.crates.io/crates/anstyle/anstyle-1.0.8.crate \ - https://static.crates.io/crates/anyhow/anyhow-1.0.86.crate \ - https://static.crates.io/crates/arc-swap/arc-swap-1.7.1.crate \ - https://static.crates.io/crates/autocfg/autocfg-1.3.0.crate \ - https://static.crates.io/crates/base16ct/base16ct-0.2.0.crate \ - https://static.crates.io/crates/base64/base64-0.22.1.crate \ - https://static.crates.io/crates/base64ct/base64ct-1.6.0.crate \ - https://static.crates.io/crates/bitflags/bitflags-2.6.0.crate \ - https://static.crates.io/crates/bitmaps/bitmaps-2.1.0.crate \ - https://static.crates.io/crates/block-buffer/block-buffer-0.10.4.crate \ - https://static.crates.io/crates/bstr/bstr-1.10.0.crate \ - https://static.crates.io/crates/bumpalo/bumpalo-3.16.0.crate \ - https://static.crates.io/crates/byteorder/byteorder-1.5.0.crate \ - https://static.crates.io/crates/bytes/bytes-1.7.1.crate \ - https://static.crates.io/crates/bytesize/bytesize-1.3.0.crate \ - https://static.crates.io/crates/cargo-credential-libsecret/cargo-credential-libsecret-0.4.7.crate \ - https://static.crates.io/crates/cargo-credential-macos-keychain/cargo-credential-macos-keychain-0.4.7.crate \ - https://static.crates.io/crates/cargo-credential-wincred/cargo-credential-wincred-0.4.7.crate \ - https://static.crates.io/crates/cargo-credential/cargo-credential-0.4.6.crate \ - https://static.crates.io/crates/cargo-platform/cargo-platform-0.1.8.crate \ - https://static.crates.io/crates/cargo-util-schemas/cargo-util-schemas-0.5.0.crate \ - https://static.crates.io/crates/cargo-util/cargo-util-0.2.14.crate \ - https://static.crates.io/crates/cargo/cargo-0.82.0.crate \ - https://static.crates.io/crates/cbindgen/cbindgen-0.27.0.crate \ - https://static.crates.io/crates/cc/cc-1.1.16.crate \ - https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \ - https://static.crates.io/crates/clap/clap-4.5.17.crate \ - https://static.crates.io/crates/clap_builder/clap_builder-4.5.17.crate \ - https://static.crates.io/crates/clap_derive/clap_derive-4.5.13.crate \ - https://static.crates.io/crates/clap_lex/clap_lex-0.7.2.crate \ - https://static.crates.io/crates/clru/clru-0.6.2.crate \ - https://static.crates.io/crates/color-print-proc-macro/color-print-proc-macro-0.3.6.crate \ - https://static.crates.io/crates/color-print/color-print-0.3.6.crate \ - https://static.crates.io/crates/colorchoice/colorchoice-1.0.2.crate \ - https://static.crates.io/crates/const-oid/const-oid-0.9.6.crate \ - https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.7.crate \ - https://static.crates.io/crates/core-foundation/core-foundation-0.9.4.crate \ - https://static.crates.io/crates/cpufeatures/cpufeatures-0.2.13.crate \ - https://static.crates.io/crates/crates-io/crates-io-0.40.4.crate \ - https://static.crates.io/crates/crc32fast/crc32fast-1.4.2.crate \ - https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.13.crate \ - https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.5.crate \ - https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.18.crate \ - https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.20.crate \ - https://static.crates.io/crates/crypto-bigint/crypto-bigint-0.5.5.crate \ - https://static.crates.io/crates/crypto-common/crypto-common-0.1.6.crate \ - https://static.crates.io/crates/ct-codecs/ct-codecs-1.1.2.crate \ - https://static.crates.io/crates/curl-sys/curl-sys-0.4.74+curl-8.9.0.crate \ - https://static.crates.io/crates/curl/curl-0.4.46.crate \ - https://static.crates.io/crates/dbus/dbus-0.9.7.crate \ - https://static.crates.io/crates/der/der-0.7.9.crate \ - https://static.crates.io/crates/deranged/deranged-0.3.11.crate \ - https://static.crates.io/crates/digest/digest-0.10.7.crate \ - https://static.crates.io/crates/dunce/dunce-1.0.5.crate \ - https://static.crates.io/crates/ecdsa/ecdsa-0.16.9.crate \ - https://static.crates.io/crates/ed25519-compact/ed25519-compact-2.1.1.crate \ - https://static.crates.io/crates/either/either-1.13.0.crate \ - https://static.crates.io/crates/elliptic-curve/elliptic-curve-0.13.8.crate \ - https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.34.crate \ - https://static.crates.io/crates/equivalent/equivalent-1.0.1.crate \ - https://static.crates.io/crates/erased-serde/erased-serde-0.4.5.crate \ - https://static.crates.io/crates/errno/errno-0.3.9.crate \ - https://static.crates.io/crates/fallible-iterator/fallible-iterator-0.3.0.crate \ - https://static.crates.io/crates/fallible-streaming-iterator/fallible-streaming-iterator-0.1.9.crate \ - https://static.crates.io/crates/faster-hex/faster-hex-0.9.0.crate \ - https://static.crates.io/crates/fastrand/fastrand-2.1.1.crate \ - https://static.crates.io/crates/ff/ff-0.13.0.crate \ - https://static.crates.io/crates/fiat-crypto/fiat-crypto-0.2.9.crate \ - https://static.crates.io/crates/filetime/filetime-0.2.25.crate \ - https://static.crates.io/crates/flate2/flate2-1.0.33.crate \ - https://static.crates.io/crates/fnv/fnv-1.0.7.crate \ - https://static.crates.io/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate \ - https://static.crates.io/crates/foreign-types/foreign-types-0.3.2.crate \ - https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.2.1.crate \ - https://static.crates.io/crates/generic-array/generic-array-0.14.7.crate \ - https://static.crates.io/crates/getrandom/getrandom-0.2.15.crate \ - https://static.crates.io/crates/git2-curl/git2-curl-0.20.0.crate \ - https://static.crates.io/crates/git2/git2-0.19.0.crate \ - https://static.crates.io/crates/gix-actor/gix-actor-0.31.5.crate \ - https://static.crates.io/crates/gix-attributes/gix-attributes-0.22.5.crate \ - https://static.crates.io/crates/gix-bitmap/gix-bitmap-0.2.11.crate \ - https://static.crates.io/crates/gix-chunk/gix-chunk-0.4.8.crate \ - https://static.crates.io/crates/gix-command/gix-command-0.3.9.crate \ - https://static.crates.io/crates/gix-commitgraph/gix-commitgraph-0.24.3.crate \ - https://static.crates.io/crates/gix-config-value/gix-config-value-0.14.8.crate \ - https://static.crates.io/crates/gix-config/gix-config-0.38.0.crate \ - https://static.crates.io/crates/gix-credentials/gix-credentials-0.24.5.crate \ - https://static.crates.io/crates/gix-date/gix-date-0.8.7.crate \ - https://static.crates.io/crates/gix-date/gix-date-0.9.0.crate \ - https://static.crates.io/crates/gix-diff/gix-diff-0.44.1.crate \ - https://static.crates.io/crates/gix-dir/gix-dir-0.6.0.crate \ - https://static.crates.io/crates/gix-discover/gix-discover-0.33.0.crate \ - https://static.crates.io/crates/gix-features/gix-features-0.38.2.crate \ - https://static.crates.io/crates/gix-filter/gix-filter-0.11.3.crate \ - https://static.crates.io/crates/gix-fs/gix-fs-0.11.3.crate \ - https://static.crates.io/crates/gix-glob/gix-glob-0.16.5.crate \ - https://static.crates.io/crates/gix-hash/gix-hash-0.14.2.crate \ - https://static.crates.io/crates/gix-hashtable/gix-hashtable-0.5.2.crate \ - https://static.crates.io/crates/gix-ignore/gix-ignore-0.11.4.crate \ - https://static.crates.io/crates/gix-index/gix-index-0.33.1.crate \ - https://static.crates.io/crates/gix-lock/gix-lock-14.0.0.crate \ - https://static.crates.io/crates/gix-macros/gix-macros-0.1.5.crate \ - https://static.crates.io/crates/gix-negotiate/gix-negotiate-0.13.2.crate \ - https://static.crates.io/crates/gix-object/gix-object-0.42.3.crate \ - https://static.crates.io/crates/gix-odb/gix-odb-0.61.1.crate \ - https://static.crates.io/crates/gix-pack/gix-pack-0.51.1.crate \ - https://static.crates.io/crates/gix-packetline-blocking/gix-packetline-blocking-0.17.5.crate \ - https://static.crates.io/crates/gix-packetline/gix-packetline-0.17.6.crate \ - https://static.crates.io/crates/gix-path/gix-path-0.10.10.crate \ - https://static.crates.io/crates/gix-pathspec/gix-pathspec-0.7.7.crate \ - https://static.crates.io/crates/gix-prompt/gix-prompt-0.8.7.crate \ - https://static.crates.io/crates/gix-protocol/gix-protocol-0.45.3.crate \ - https://static.crates.io/crates/gix-quote/gix-quote-0.4.12.crate \ - https://static.crates.io/crates/gix-ref/gix-ref-0.45.0.crate \ - https://static.crates.io/crates/gix-refspec/gix-refspec-0.23.1.crate \ - https://static.crates.io/crates/gix-revision/gix-revision-0.27.2.crate \ - https://static.crates.io/crates/gix-revwalk/gix-revwalk-0.13.2.crate \ - https://static.crates.io/crates/gix-sec/gix-sec-0.10.8.crate \ - https://static.crates.io/crates/gix-submodule/gix-submodule-0.12.0.crate \ - https://static.crates.io/crates/gix-tempfile/gix-tempfile-14.0.2.crate \ - https://static.crates.io/crates/gix-trace/gix-trace-0.1.9.crate \ - https://static.crates.io/crates/gix-transport/gix-transport-0.42.3.crate \ - https://static.crates.io/crates/gix-traverse/gix-traverse-0.39.2.crate \ - https://static.crates.io/crates/gix-url/gix-url-0.27.5.crate \ - https://static.crates.io/crates/gix-utils/gix-utils-0.1.12.crate \ - https://static.crates.io/crates/gix-validate/gix-validate-0.8.5.crate \ - https://static.crates.io/crates/gix-worktree/gix-worktree-0.34.1.crate \ - https://static.crates.io/crates/gix/gix-0.64.0.crate \ - https://static.crates.io/crates/glob/glob-0.3.1.crate \ - https://static.crates.io/crates/globset/globset-0.4.14.crate \ - https://static.crates.io/crates/group/group-0.13.0.crate \ - https://static.crates.io/crates/hashbrown/hashbrown-0.14.5.crate \ - https://static.crates.io/crates/hashlink/hashlink-0.9.1.crate \ - https://static.crates.io/crates/heck/heck-0.4.1.crate \ - https://static.crates.io/crates/heck/heck-0.5.0.crate \ - https://static.crates.io/crates/hex/hex-0.4.3.crate \ - https://static.crates.io/crates/hkdf/hkdf-0.12.4.crate \ - https://static.crates.io/crates/hmac/hmac-0.12.1.crate \ - https://static.crates.io/crates/home/home-0.5.9.crate \ - https://static.crates.io/crates/http-auth/http-auth-0.1.10.crate \ - https://static.crates.io/crates/humantime/humantime-2.1.0.crate \ - https://static.crates.io/crates/idna/idna-0.5.0.crate \ - https://static.crates.io/crates/ignore/ignore-0.4.22.crate \ - https://static.crates.io/crates/im-rc/im-rc-15.1.0.crate \ - https://static.crates.io/crates/indexmap/indexmap-2.5.0.crate \ - https://static.crates.io/crates/is_terminal_polyfill/is_terminal_polyfill-1.70.1.crate \ - https://static.crates.io/crates/itertools/itertools-0.13.0.crate \ - https://static.crates.io/crates/itoa/itoa-1.0.11.crate \ - https://static.crates.io/crates/jiff-tzdb-platform/jiff-tzdb-platform-0.1.0.crate \ - https://static.crates.io/crates/jiff-tzdb/jiff-tzdb-0.1.0.crate \ - https://static.crates.io/crates/jiff/jiff-0.1.12.crate \ - https://static.crates.io/crates/jobserver/jobserver-0.1.32.crate \ - https://static.crates.io/crates/js-sys/js-sys-0.3.70.crate \ - https://static.crates.io/crates/kstring/kstring-2.0.2.crate \ - https://static.crates.io/crates/lazy_static/lazy_static-1.5.0.crate \ - https://static.crates.io/crates/lazycell/lazycell-1.3.0.crate \ - https://static.crates.io/crates/libc/libc-0.2.158.crate \ - https://static.crates.io/crates/libdbus-sys/libdbus-sys-0.2.5.crate \ - https://static.crates.io/crates/libgit2-sys/libgit2-sys-0.17.0+1.8.1.crate \ - https://static.crates.io/crates/libloading/libloading-0.8.5.crate \ - https://static.crates.io/crates/libnghttp2-sys/libnghttp2-sys-0.1.10+1.61.0.crate \ - https://static.crates.io/crates/libredox/libredox-0.1.3.crate \ - https://static.crates.io/crates/libsqlite3-sys/libsqlite3-sys-0.28.0.crate \ - https://static.crates.io/crates/libssh2-sys/libssh2-sys-0.3.0.crate \ - https://static.crates.io/crates/libz-sys/libz-sys-1.1.20.crate \ - https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.14.crate \ - https://static.crates.io/crates/lock_api/lock_api-0.4.12.crate \ - https://static.crates.io/crates/log/log-0.4.22.crate \ - https://static.crates.io/crates/matchers/matchers-0.1.0.crate \ - https://static.crates.io/crates/maybe-async/maybe-async-0.2.10.crate \ - https://static.crates.io/crates/memchr/memchr-2.7.4.crate \ - https://static.crates.io/crates/memmap2/memmap2-0.9.4.crate \ - https://static.crates.io/crates/minimal-lexical/minimal-lexical-0.2.1.crate \ - https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.8.0.crate \ - https://static.crates.io/crates/miow/miow-0.6.0.crate \ - https://static.crates.io/crates/nom/nom-7.1.3.crate \ - https://static.crates.io/crates/normpath/normpath-1.3.0.crate \ - https://static.crates.io/crates/nu-ansi-term/nu-ansi-term-0.46.0.crate \ - https://static.crates.io/crates/num-conv/num-conv-0.1.0.crate \ - https://static.crates.io/crates/num-traits/num-traits-0.2.19.crate \ - https://static.crates.io/crates/num_threads/num_threads-0.1.7.crate \ - https://static.crates.io/crates/once_cell/once_cell-1.19.0.crate \ - https://static.crates.io/crates/opener/opener-0.7.2.crate \ - https://static.crates.io/crates/openssl-macros/openssl-macros-0.1.1.crate \ - https://static.crates.io/crates/openssl-probe/openssl-probe-0.1.5.crate \ - https://static.crates.io/crates/openssl-src/openssl-src-300.3.2+3.3.2.crate \ - https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.103.crate \ - https://static.crates.io/crates/openssl/openssl-0.10.66.crate \ - https://static.crates.io/crates/ordered-float/ordered-float-2.10.1.crate \ - https://static.crates.io/crates/orion/orion-0.17.6.crate \ - https://static.crates.io/crates/os_info/os_info-3.8.2.crate \ - https://static.crates.io/crates/overload/overload-0.1.1.crate \ - https://static.crates.io/crates/p384/p384-0.13.0.crate \ - https://static.crates.io/crates/parking_lot/parking_lot-0.12.3.crate \ - https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.10.crate \ - https://static.crates.io/crates/pasetors/pasetors-0.6.8.crate \ - https://static.crates.io/crates/pathdiff/pathdiff-0.2.1.crate \ - https://static.crates.io/crates/pem-rfc7468/pem-rfc7468-0.7.0.crate \ - https://static.crates.io/crates/percent-encoding/percent-encoding-2.3.1.crate \ - https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.14.crate \ - https://static.crates.io/crates/pkcs8/pkcs8-0.10.2.crate \ - https://static.crates.io/crates/pkg-config/pkg-config-0.3.30.crate \ - https://static.crates.io/crates/powerfmt/powerfmt-0.2.0.crate \ - https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.20.crate \ - https://static.crates.io/crates/primeorder/primeorder-0.13.6.crate \ - https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.86.crate \ - https://static.crates.io/crates/prodash/prodash-28.0.0.crate \ - https://static.crates.io/crates/quote/quote-1.0.37.crate \ - https://static.crates.io/crates/rand/rand-0.8.5.crate \ - https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.1.crate \ - https://static.crates.io/crates/rand_core/rand_core-0.6.4.crate \ - https://static.crates.io/crates/rand_xoshiro/rand_xoshiro-0.6.0.crate \ - https://static.crates.io/crates/redox_syscall/redox_syscall-0.5.3.crate \ - https://static.crates.io/crates/regex-automata/regex-automata-0.1.10.crate \ - https://static.crates.io/crates/regex-automata/regex-automata-0.4.7.crate \ - https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.29.crate \ - https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.4.crate \ - https://static.crates.io/crates/regex/regex-1.10.6.crate \ - https://static.crates.io/crates/rfc6979/rfc6979-0.4.0.crate \ - https://static.crates.io/crates/rusqlite/rusqlite-0.31.0.crate \ - https://static.crates.io/crates/rustfix/rustfix-0.8.5.crate \ - https://static.crates.io/crates/rustix/rustix-0.38.36.crate \ - https://static.crates.io/crates/ryu/ryu-1.0.18.crate \ - https://static.crates.io/crates/same-file/same-file-1.0.6.crate \ - https://static.crates.io/crates/schannel/schannel-0.1.23.crate \ - https://static.crates.io/crates/scopeguard/scopeguard-1.2.0.crate \ - https://static.crates.io/crates/sec1/sec1-0.7.3.crate \ - https://static.crates.io/crates/security-framework-sys/security-framework-sys-2.11.1.crate \ - https://static.crates.io/crates/security-framework/security-framework-2.11.1.crate \ - https://static.crates.io/crates/semver/semver-1.0.23.crate \ - https://static.crates.io/crates/serde-untagged/serde-untagged-0.1.6.crate \ - https://static.crates.io/crates/serde-value/serde-value-0.7.0.crate \ - https://static.crates.io/crates/serde/serde-1.0.209.crate \ - https://static.crates.io/crates/serde_derive/serde_derive-1.0.209.crate \ - https://static.crates.io/crates/serde_ignored/serde_ignored-0.1.10.crate \ - https://static.crates.io/crates/serde_json/serde_json-1.0.128.crate \ - https://static.crates.io/crates/serde_spanned/serde_spanned-0.6.7.crate \ - https://static.crates.io/crates/sha1/sha1-0.10.6.crate \ - https://static.crates.io/crates/sha1_smol/sha1_smol-1.0.1.crate \ - https://static.crates.io/crates/sha2/sha2-0.10.8.crate \ - https://static.crates.io/crates/sharded-slab/sharded-slab-0.1.7.crate \ - https://static.crates.io/crates/shell-escape/shell-escape-0.1.5.crate \ - https://static.crates.io/crates/shell-words/shell-words-1.1.0.crate \ - https://static.crates.io/crates/shlex/shlex-1.3.0.crate \ - https://static.crates.io/crates/signature/signature-2.2.0.crate \ - https://static.crates.io/crates/sized-chunks/sized-chunks-0.6.5.crate \ - https://static.crates.io/crates/smallvec/smallvec-1.13.2.crate \ - https://static.crates.io/crates/socket2/socket2-0.5.7.crate \ - https://static.crates.io/crates/spki/spki-0.7.3.crate \ - https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \ - https://static.crates.io/crates/strsim/strsim-0.11.1.crate \ - https://static.crates.io/crates/subtle/subtle-2.6.1.crate \ - https://static.crates.io/crates/supports-hyperlinks/supports-hyperlinks-3.0.0.crate \ - https://static.crates.io/crates/supports-unicode/supports-unicode-3.0.0.crate \ - https://static.crates.io/crates/syn/syn-2.0.77.crate \ - https://static.crates.io/crates/tar/tar-0.4.41.crate \ - https://static.crates.io/crates/tempfile/tempfile-3.12.0.crate \ - https://static.crates.io/crates/terminal_size/terminal_size-0.3.0.crate \ - https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.63.crate \ - https://static.crates.io/crates/thiserror/thiserror-1.0.63.crate \ - https://static.crates.io/crates/thread_local/thread_local-1.1.8.crate \ - https://static.crates.io/crates/time-core/time-core-0.1.2.crate \ - https://static.crates.io/crates/time-macros/time-macros-0.2.18.crate \ - https://static.crates.io/crates/time/time-0.3.36.crate \ - https://static.crates.io/crates/tinyvec/tinyvec-1.8.0.crate \ - https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.1.crate \ - https://static.crates.io/crates/toml/toml-0.8.19.crate \ - https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.8.crate \ - https://static.crates.io/crates/toml_edit/toml_edit-0.22.20.crate \ - https://static.crates.io/crates/tracing-attributes/tracing-attributes-0.1.27.crate \ - https://static.crates.io/crates/tracing-chrome/tracing-chrome-0.7.2.crate \ - https://static.crates.io/crates/tracing-core/tracing-core-0.1.32.crate \ - https://static.crates.io/crates/tracing-log/tracing-log-0.2.0.crate \ - https://static.crates.io/crates/tracing-subscriber/tracing-subscriber-0.3.18.crate \ - https://static.crates.io/crates/tracing/tracing-0.1.40.crate \ - https://static.crates.io/crates/typeid/typeid-1.0.2.crate \ - https://static.crates.io/crates/typenum/typenum-1.17.0.crate \ - https://static.crates.io/crates/unicase/unicase-2.7.0.crate \ - https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.15.crate \ - https://static.crates.io/crates/unicode-bom/unicode-bom-2.0.3.crate \ - https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \ - https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.23.crate \ - https://static.crates.io/crates/unicode-width/unicode-width-0.1.13.crate \ - https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.5.crate \ - https://static.crates.io/crates/url/url-2.5.2.crate \ - https://static.crates.io/crates/utf8parse/utf8parse-0.2.2.crate \ - https://static.crates.io/crates/valuable/valuable-0.1.0.crate \ - https://static.crates.io/crates/vcpkg/vcpkg-0.2.15.crate \ - https://static.crates.io/crates/version_check/version_check-0.9.5.crate \ - https://static.crates.io/crates/walkdir/walkdir-2.5.0.crate \ - https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \ - https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.93.crate \ - https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.93.crate \ - https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.93.crate \ - https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.93.crate \ - https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.93.crate \ - https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ - https://static.crates.io/crates/winapi-util/winapi-util-0.1.9.crate \ - https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ - https://static.crates.io/crates/winapi/winapi-0.3.9.crate \ - https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \ - https://static.crates.io/crates/windows-sys/windows-sys-0.52.0.crate \ - https://static.crates.io/crates/windows-sys/windows-sys-0.59.0.crate \ - https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \ - https://static.crates.io/crates/windows-targets/windows-targets-0.52.6.crate \ - https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \ - https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.6.crate \ - https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \ - https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.6.crate \ - https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \ - https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.6.crate \ - https://static.crates.io/crates/windows_i686_gnullvm/windows_i686_gnullvm-0.52.6.crate \ - https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \ - https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.6.crate \ - https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \ - https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.6.crate \ - https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \ - https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.6.crate \ - https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \ - https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.6.crate \ - https://static.crates.io/crates/winnow/winnow-0.6.18.crate \ - https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.7.35.crate \ - https://static.crates.io/crates/zerocopy/zerocopy-0.7.35.crate \ - https://static.crates.io/crates/zeroize/zeroize-1.8.1.crate" -MD5SUM="6146712827673079129551b12e6ce312 \ - 10765b0a906b6e28373a8e162b80dc82 \ - 579e59ba996675f454d456471924ea9d \ - adbb51e40b28255c49b2ad1d956eff19 \ - 03b2d126766ed746706241b4c7487654 \ - 001e9b87bf3af37bc588654f4a5b50c0 \ - f8c5610f871d7985ed467fd18ecb2b05 \ - 64c9c06c903f9515ece3705342362a9e \ - e2c3ead6439544dad05a90db9f59cbdd \ - 1eace5e9ecd352f139eef4c16e2c1660 \ - 27ebd71018dd6d909d4332d755908610 \ - 3d57cfa9d3c706404483c80170e1f7f9 \ - 19bd0fc50aacf1d2af60bd5908442db6 \ - a5f88692dcd3b16eed2f184509dce05b \ - 88a8c7336f056de768ee2966cefd8303 \ - 5a1ece5125e266d39693587725f0270d \ - 20084c4c04bcc06fd3d7ff662deca706 \ - bd4c0e123b65937461c135ff7030a44e \ - a765e0d59ae689aa9eb9722c6553e499 \ - 1f3a8c93940230a06fdf5223a64000bf \ - 023b03cf9968b29253a5dfe62051008d \ - d5f24b25f3b9c60539df0dc5ea309be5 \ - a3c12a0b2ddb55ec1b245f9950e7bdf1 \ - 45339d90b2b3a4f123af5ec459954102 \ - dae5f58ddfc8f98be6fe365d378888d2 \ - 04c2dcc3c8184578320c53d63a07aed0 \ - 7b80c6a1ed7d95e0f57654655d86d2e8 \ - 1b319fe268e52aed983f6ef87cbca25f \ - aa9954fee03063b3410de53896412ced \ - 77884a6a5e16b7cc575ae5941bd5c1fe \ - 704a72387b69a38dd7c18a6ebf85448d \ - fa53118ba5dda4c1ff47448496a87282 \ - f4123f70146bb99390192efff6367652 \ - caf6528362a008de1b3a3302effb3ff7 \ - 4a9fd25f020f4a3d461ef5915236a62f \ - 8de3f4281ffaf3e841f25e00ec35f8bd \ - 74634128440dbc3766bda76fdf0aaa05 \ - 7b813c52a542db88e061c0fb20d5ad7e \ - 0eefb31613be4bc92f6ff7ff7f606302 \ - 7003229295eeee486c4144d09dd66a41 \ - 8a3db8ec4d6912594fb2599bf2d6feba \ - 04baa08ff2d38dad4a10e7a27a9768d4 \ - 8916bb4ab39f22fa9651fe98c92faa5e \ - 603dc8e08934ea5ae9025f5456fa6679 \ - 83b095b5e7b8eed0c1e550128b940cc6 \ - 6ed0aab506ad1ec23e34c6aec4efd1d7 \ - c5229cfccb6a1598e74a837dbc9e2797 \ - 4d7e3bc6c42f8a875a87246ed14d9948 \ - aceb9dbc816de4f1cbebc8b168587a31 \ - 43f25686207084b3290a2b488909129c \ - f816d75ddc8831b6a300a739ddae267b \ - 442a035d4bebfb01fde2e9299563f73d \ - 396f4f63322338c26d76b2f638646178 \ - 44505199ec0964feb5488051b4ac92d5 \ - c9a5747e504d7f3dadc1fc563ae3d6f3 \ - d2695f81f5e7b7a44da337b59c56b363 \ - 89e88633cab0e4b6f3d3878b84dffe8b \ - 4ff87b08398120ca53d49a4dee338034 \ - e7d8d4d8acb7cea0a0c350d2202d5417 \ - 809c655613979bc5d65cb6d4afa24c91 \ - b170c380ee4d59e4ed866afaa26a86c7 \ - dde85204706c20baed5d666258a08b74 \ - d022bc79e1931c2bd4ebbe65cf3d2309 \ - 3d62bfbbe08bdcee55fcb8cda85554d9 \ - 198d7f7c37f632bc83502b28870b6d60 \ - 3ce1c12d6f46952c4a394c8c3bb9437e \ - 857c96071a8fd39e7458707e9fae87b9 \ - 6d28dbfa9d67ad11061716672a7a1519 \ - ffc9c1ed3a5f35182084b40ff2ff6111 \ - 9a25a5393856f8a0bbc14d82e27414a6 \ - bdf329a72ecd0605c296f25e53136706 \ - 9437e2df9544e13b80709ea52f42580a \ - bcd5fd8c2b279da10b5a4d7b67eb555e \ - 4abeb2b6db91c4964c17ec4bf24248f4 \ - 7543e8639ad2e29866b522e20c35152a \ - b4944c105ff1b8614beeb153e7179027 \ - 3ef10447881b00471497237c64f44ac2 \ - 108d90c246e09f46087613284e8651e7 \ - c37409eb47cd1fad7d5b8b4297f44860 \ - 707c14d536067554f7fe03a8529cf426 \ - 987cd07b13068d49cd824156f187c4b2 \ - 8dab3b3ec00dc56cffde0b0c410d47b5 \ - 667e86b8b8d96ab4e9605627ce7dcc9a \ - 78c898fdaa3968e23904bf8538c4a271 \ - c3e51926c9853b714191ef1bec90e2ce \ - 64a6d8fe0c9a450bcefa41894e17d7ac \ - 3c67481b4433a3219846e41d09aaeaa9 \ - b48f497bd49c7c564a337336fa1452db \ - 18dc6e763804277ea7e0b6d605e2f48c \ - c06e4b880b5df5aa06bb95cdc5e0cc45 \ - 49ea26cef36fccd5e48654d71990a510 \ - 101226d32a04adc0a4232050dbf85056 \ - 0f5f5b1f9ebc3d31770c7ae2e33d409c \ - 1b195f502cb635cc6ba02e1e9ca263ff \ - f2a13be3bddfdcf149289112545c90b4 \ - ef44c590e5ec37a0a6bb3d43eedce10b \ - 987899bb7fe6fcea02172df024f6ca81 \ - 56c2ebd8062da8a85fb5f63f436c534a \ - bfdbb059be182d0623fd78ef4814a4fd \ - 9ec0bbdb877e8bc55d560ba8f3aca61d \ - cbc8b5bf5b6317462c6b7c3b93339641 \ - 8e335e572cd05ff1a59aebcbdba63da3 \ - a0a2617ead009945e1c126286a462d68 \ - 3b3a12dacee5dccaa666e5826b190857 \ - 98f9d0195996d53a8ac048a2617b2eeb \ - 128cb74306ddaca878559397ac1e4270 \ - ed110fdc815a3c79395c3451319067f3 \ - 2180948a1fe17db88e9f97870234f87a \ - adafc45a92f42b3377a06b041a2ab658 \ - 5a602e57a0c78ee9669fad2b6eb7f623 \ - 1dca8bc86f316d5d9f7a4a85096e0456 \ - 6504e1fa6884d62eeb984429ca147f5d \ - 3c46007dd2897bc50e97bd8c9a1f3688 \ - 23f88f41f08c7299ef710390c97eabcc \ - 4f574268e4cda806c259fe125fad2424 \ - 05640b13a0acd3487fc52e4960dbbeb2 \ - 0651f1ec4a8c291a8ef2b8019cdc837c \ - 21e87390feca912ee816ff9a82731d8c \ - 8158c000c640fe6051312a3b7daedd81 \ - 306973142929c0d96b49240a4f41e855 \ - 226c79aebfd626b4c94572bf3aebbfdd \ - 3fa4d5044dff847ff6fef1a2d31c7771 \ - 63ec81e48122d9da6c0e30350ba198df \ - 539588dc3151dd1a2eafb1abc1b328e7 \ - 3e7afbfddddc63455fc021e86fa8a0e4 \ - 54e91302c58502f1eb25437487037e4e \ - b0ec53820802257b4a2f2e43c591faf7 \ - a43d1cf7107f18b253ec558c21f09492 \ - 55514cbc770c9a1a3eccda12d839f859 \ - 88d75dde8c6b2c54aa342e60238d89fd \ - 1e642722f3eca4e8430b1fbf79f2e8a5 \ - 22c18c8034a833c91bb51cbd1433fd13 \ - 3e8ccb40641c0990c9200c667e8a965d \ - d8503dcb614aeb6cd075e3360e708dc3 \ - 66817b9ee2b91822bb6443fa34c4c027 \ - 102dd5ccf7f0e35f281febc864643590 \ - 8136d042881d797047cdf7c74144af58 \ - 33aa2161d490d8fb29bbef38fa1f557e \ - 15f21d672cd5a4cbf2e00e991deb5951 \ - 2d6d28ec311884da69bcaf320ada8ad5 \ - 423ea3c18df8759400c3d0a381738c64 \ - 974e766c6583278ac82a83632b75b65e \ - 0339cc04f4471f002e421e2328a86bf5 \ - 820fed612601a95415de79471ddd9b82 \ - b92fa50f56a1e06a7f1bf665442d4a73 \ - ce5935e8063a452913a61e5405b33cb9 \ - 1d3e530a3410fc95a6987d70f84a6332 \ - 8cd6f472d6904b0c507a456dddb68eb6 \ - 4e0c068ba38fa8e0aa6c46bce5e9d2ab \ - d81f9251921f8a289dcf69fe4ccc3788 \ - 791938196c6a3f4934408ae05f1cd5d8 \ - c01022fe0357c10ca1d48b16187f81bd \ - b5305bde14813da51d536a9df564db69 \ - b0e8879bc367bdad1fea51407ae22380 \ - 25119b3f34f4d5298dade622e10a54c5 \ - fe29680d6c4b75cc9ffeceb588e1e01c \ - 83cd180e6991b62b1cc6d646bf4d0284 \ - 22c9fb2659929f432d5fe217d1cb74cf \ - 5d87e8530342ef2a980b1c96dafd27f0 \ - 39bc626af823fa43f79f8917b6b2e506 \ - c9c58f8af8bc9eaa04fb4b7e61ad56a1 \ - af1ea911541f57099f81ed6e8fe480bc \ - 371fb71b0651ef8bf26e827ec21b1f76 \ - 45a825695402aa13c026cc81b30ccfd6 \ - 5a7af442aa87deb7aa2e47aa53ecb4b0 \ - bb0c20f6e3faaa647d9c463c5501a8e0 \ - 23cc9e52c52465f5b225e62ab7cc3457 \ - f87a00a9b24bb7ea2736fcacf57027ab \ - fd05e11da4cc641616b87a31223645bd \ - 9165afe1f143b7104b3c0868b2cae924 \ - 497cb030511762f0e30f395fb9c092ec \ - d7931ae20ea0df9dca67aa870c5e578f \ - b928626f9e8328e4085fc27cfc640c19 \ - 60dfb05876b9242282ded82fc74db945 \ - 73c81da3754295e39ea4a99517b1e794 \ - 0af12a5e277bc37fef415940a42d1bf3 \ - 6d16890925497732bdbedd7636c9546f \ - eb44c81f81e4aecdbdbafeac9c0fdcab \ - efeb260cf6b2a13607ee12321e39cc8d \ - 29614f150859d094548bed37e78f586b \ - 171bb701365ec4b0c12ae5387e034c16 \ - c0aab5e6eaaa6a2f3c7ed44f123d1c7d \ - 5cf346df4658ff1ab6c0b3b3dba48f75 \ - 8b708bc4b33c5e1683467444c9ed41b0 \ - 7c3a27860a0082241f5c9a069e431fba \ - c14d50ef3ce9b2640d2a9d68c53834b9 \ - f17aecb8887cf0ecd823623160aed7db \ - 9a56f9ea516d7912a9e5257a455231c2 \ - a56461a712a83abc691cf473d1835228 \ - 5b5de6cffe4726037a5ec6d6931c80f3 \ - e092b3abcc54806f2a35889d725bf95f \ - 4578b5cccbe636b7e5becdf5543b3802 \ - 8390247ae7126c00e162732b249be9d7 \ - a997075a6ee099a1589014357bd5e6f8 \ - 28d34115cfbbe0e8f80333591f2cdd84 \ - 907244c0d3791f3f981c7cc8e4cad0a3 \ - 7d29c9fc3332563ba2d71558e8cf3ffd \ - 14e0218b195b6fca32e0972c7303d3de \ - 8d069ba8d01c8c6c90ebfcb149a4573c \ - 71624c8a64c75744a95f02a09614f220 \ - f8408c2543795bb080bebfba7e38e048 \ - 936913c779b00c6355ffbbb53023dcae \ - 03a7ad2814bd9dd34e0acec8ca4f855e \ - 9822018c3ee7133a6f093f679d639da2 \ - c63cc43554a8abcf7b1166626f0e3736 \ - fe316e1d51e3dff1e0455d0142dd37e4 \ - 8bc06de4ec1fda57035d2bd07535d670 \ - c40bb551772810d818857841ea389f1e \ - a37720d4e4cbebd28ac9c7930137a9d6 \ - 0ba30a94d7b8865c23e86d4d64e5b91e \ - a9a6ce6cd4b12f9c4f6840df87d5da0d \ - 54148ff5f2a4a6f4f1e857b0bf854bf0 \ - 524ffd7a9b5b25c4d388686a5dde5cac \ - 30eb4de1c1a3bd214d7649b891abf444 \ - 60ddef23e68d8cbb9f9f33b747fe1734 \ - d226e4317502fe822b21daeda4d7488c \ - 480a3b8e8201739e157bb648f9243962 \ - 533608bb3b2587c0aa148dc36cc16429 \ - ec5466d73ce9285f92a1458cdc1b4046 \ - ee7a5f842c39bc47c474196e83b0df5f \ - e30085994bbeb4b7f4895d48216d5476 \ - a1626b8f4d165b1b60d960862eba4cf0 \ - ca0ecc8e22d810207704d4cd743ca657 \ - 949794da6e701af465ba6664e8e1b5de \ - 95f4b6766a27d814b4e54d1ccb3b7fc9 \ - 158e2b15e6b75f6090767642138f75ff \ - f2303650593b13e30a85e39d8c79c961 \ - 05ec4163d860f882c88fcc77f78d6172 \ - a5f742e592150e471690627bbb77c2b8 \ - 4320a9e82272686cb97d7af005f5360d \ - 624ea23761970724e7c0d8003ff6fffb \ - 070b856c03d3baed2cc372b743df48f8 \ - d721f68da2cb15f91930bcfad1ff3596 \ - 56de037d755aeb0b45169991f9567cd7 \ - 2d8d8b377d144f5e32b4f65a69eb0b24 \ - 6a0950fa3775d755dbbdbd24a2841786 \ - f1358be8c98b98837cbd2cf51e75f8b3 \ - 46e0a2b34b2a6108cad9e2b1da756cab \ - bacf2c641bffbe4d891342ee2e0688e0 \ - 3b3ebed978a7c19de258926438888de5 \ - d3ccccba78e5375faf8e543884f9e84e \ - 5736abfbc0096d2328905124eaeeb331 \ - eeda11db8ced625011d8b88d36765321 \ - 63ac7c73b26aae13a320ebbc5fb215a3 \ - 46f5ef89ecea2d7813e6eccb896dd555 \ - 597586743b4769a8f6c169803ad3bb2a \ - d0ae58592f09d5bf6d1a943291ca02f2 \ - 5f7008c5bb010882e4cd393b8a1a49d1 \ - d7602381c0bc21d10603cc940a837b06 \ - 3426961d0acb81854d9b734c59ba60f7 \ - 289b776935f2184c6ba2974877285013 \ - 96261f3cee18842060fd64d618e056d8 \ - 08abe36adae4caee78acf034c56a550b \ - ce622fdb8d18cd1c13ed8fadc5400c10 \ - 6c623a8eed8450399ec323a72e96855c \ - a5f10909341dab15fcdee74b0409ec69 \ - c51211275ff1e841326726837820eed9 \ - 50d5a501f911bb592f0dce2d052c2aa8 \ - 746d5deb23a67c019e5b2381d76d4afa \ - ae35a16ea73fc405f1cf50fa35b70ddd \ - c9defe80406280bcfce4ecf31c0200b3 \ - fbe5da24bd1beef6125107ee41118187 \ - 611730d5a0344bd87742297274631890 \ - 82319ff2617041ec54d5eb3ff5f381e3 \ - 4f6fd5325554bf939f7518dc4f74dae5 \ - 80c9bb4310021ed58b5ac2deb799bc8b \ - d7f7b399739aa7278de3688945c81922 \ - 744c8676a49438f5c89891e2f788d69a \ - b7eae58d7a80112442643ee2ff481ef7 \ - 8075eac572b0aca416ab1c827ae95375 \ - 5b4ddf181e910b8a0355923fe24ede58 \ - 6739d2c377b9e20af9a23022e362aa33 \ - 7818a75208424a6d05d1d868559f0adf \ - cbfa351bd29e3779266c82b3996fc9ab \ - 19e6e4e45004e2b023e49e37c34b4e31 \ - 9de7b54918f327a684ef664a4fae3f5a \ - c678a7da0ee4b850ebde0474144a0415 \ - fcc6926cb92e9a4a8aa57e2614fda0ec \ - 3dc30b8ce4503073c466fb0735ab4920 \ - a709158ea763bd3ec7f7e26ab8c9c82f \ - 9dd610282e23bbd40016697350c1babb \ - 51534ecc7b99f6ba320b65ac2593f82f \ - a6655e5e9845cb569991e87b5b38a1fc \ - beede1fdd5ce9840d395abc905d8ab3e \ - 7e2eeef14bb62adaf15f1e921538adaa \ - 0a906c03436ec2dcc4c311c21fee0da2 \ - 4e56ae1f16966fd35afe97544e5bc369 \ - 6ebb8deee5a5a0d1c26b20eeee1926b3 \ - 05fc1fbfb646a394e35043182c63b5de \ - 8a607889ac525c2286e2f7c88f89d931 \ - c3d42808c0c5cc0283666964f83df775 \ - ca65153603a1a7240bbd9d2ce19f2d67 \ - 97fa43aa1afabd1f5f3d1070389b42ba \ - e250b0b2e22ab75a9ea8aed21d77b3ee \ - 00d5d49cf161f5675bc94eaaa07dd544 \ - 8a83a7122dc03fdd42e5ba67680e5300 \ - 470f527a51d3921895bd2583fce8d9c4 \ - 4efc6e7a118524cecefa0023a18accf7 \ - e900a384ac7dbb320fe6a7279fbfef89 \ - f9880f1c33a7bc7b0e6e086b504bf38f \ - f38b27b8c9625110a51293658f1cc014 \ - e972ea58ec203bfa6c79c1207852298b \ - 60c58ee8cdca36db589e87c79c9efff4 \ - e1c3e3ab6fe16b9c4d43b10dddb2b50c \ - 6f4e8fbcd987fe542119b0338f374ec0 \ - 044de2128be1885b0576bc4a6cba36ea \ - 6c096ffbebd1eaef4fd4570ee127c7f7 \ - db96b50050277bf05a3c68534bbb9586 \ - e908e1808f2a480449f8d86281ae24ef \ - 09de9d01e7331ff3da11f58be8bef0df \ - 0498c4a11448bfc35dc7bb2caa64c753 \ - f2797ade0e36f1e5d6be9d11b5076582 \ - 2376de634160158ece40c4bc2ab3eb41 \ - 73b177d6d000daaa8f05790414a887a3 \ - 24c64817e85ef77765ed0f26c31c9b4c \ - 9e876a38acd8262d97e9302ecb4e0f72 \ - dae6d89034a6988042fd8be4cf5e037d \ - 8c8adde50f0a531c407c5b68ab928f0b \ - de2839e16d9d7a9fd1c397da62f62b4a \ - 233b17dfcf7e49ac791eef30b7f406e3 \ - e0c35ffb8cfdb74a39bf799811f79304 \ - 7cb99b00381f697eaf8a322ed3b8205c \ - 1baf62319b533f3d996993b82305e547 \ - d990172b607020701f9e84ca8e1c043c \ - 311ded6588844e072d3fb953a8f994da \ - 0a68848588e847ceccf504891584d00b \ - 3f265cbde7668f38c1229043475470a9 \ - 45b469ad607b912256b7c80141fa2d17 \ - 4e50e886c72204c268c15a3230001d71 \ - 7799baff9a5664205d9110a2624e8989 \ - b95760e9133ba1bb456d0f0cef74c9a4 \ - 0967e0df46d1af4eec8dab6b12241600 \ - 8b9abf87faaabfcedea7b9ac6381752d \ - 74ea77ca2056e0f68d6aa6f341c5ee3b \ - fc484f491cd0c91e5d7343776e055a77" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="rust-opt" -MAINTAINER="orphaned - no maintainer" -EMAIL="NOEMAIL" diff --git a/development/cargo-c/slack-desc b/development/cargo-c/slack-desc deleted file mode 100644 index 133e07a2ed..0000000000 --- a/development/cargo-c/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -cargo-c: cargo-c (cargo C-ABI helper) -cargo-c: -cargo-c: cargo-c is an extension for Cargo, the Rust package manager, that -cargo-c: helps to build and install C-ABI compatible dynamic and static -cargo-c: libraries. It produces and installs a correct pkg-config file, a -cargo-c: static library and a dynamic library, and a C header to be used -cargo-c: by any C (and C-compatible) software. -cargo-c: -cargo-c: -cargo-c: Homepage: https://github.com/lu-zero/cargo-c/ -cargo-c: diff --git a/development/cargo-vendor-filterer/README b/development/cargo-vendor-filterer/README deleted file mode 100644 index 83f9687535..0000000000 --- a/development/cargo-vendor-filterer/README +++ /dev/null @@ -1,10 +0,0 @@ -cargo-vendor-filterer (Vendor rust libraries based on filters) - -cargo-vendor-filterer works like "cargo vendor", but supports filters -that allow excluding libraries one isn't interested in, like -libraries only needed on other platforms, etc. - -NOTE: -I've included a "cargo-mkvendored.sh" script to generate filtered -vendored sources for a rust or python/rust slackbuild. It needs to be -run from within a slackbuild directory. diff --git a/development/cargo-vendor-filterer/cargo-mkvendored.sh b/development/cargo-vendor-filterer/cargo-mkvendored.sh deleted file mode 100644 index 8ba7aa2238..0000000000 --- a/development/cargo-vendor-filterer/cargo-mkvendored.sh +++ /dev/null @@ -1,151 +0,0 @@ -#!/bin/bash - -# Create $PRGNAM-vendored-sources-$VERSION-$VSBUILD.tar.xz -# Requires network access, but does not require root privilege. -# Requires that $PRGNAM's REQUIRES need to be installed first (rust-opt) -# and cargo-vendor-filterer installed to include just the linux deps -# -# Expects to be run within a slackbuild dir with the source archive -# already downloaded. -# -# Variables to use in your SlackBuild: -# VSBUILD # same use as BUILD but for vendored sources -# VSDIR=/sub/dir/ # (optional) alternate location in src for vendor dir -# -# Vendors sources for the following targets -# i686-unknown-linux-gnu -# x86_64-unknown-linux-gnu -# arm-unknown-linux-gnueabihf -# aarch64-unknown-linux-gnu - -SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}" - -INFO="$( echo *.info )" -if [ ! -e "$INFO" ]; then - echo "No (or multiple) .info file in current dir" 1>&2 - exit 1 -fi - -SBUILD="$( echo *.SlackBuild )" -if [ ! -e "$SBUILD" ]; then - echo "No (or multiple) .SlackBuild file in current dir" 1>&2 - exit 1 -fi - -CWD=$(pwd) -source ./$INFO - -INFOERR="variable not set, are you sure you have a valid *.info file?" -echo ${PRGNAM:?$INFOERR} -echo VERSION=${VERSION:?$INFOERR} - -set -e -WORKDIR=$( mktemp -d ) -cd $WORKDIR - -# don't depend on user's ~/.cargo -mkdir -p cargohome -export CARGO_HOME=$(pwd)/cargohome - -egrep "^BUILD=|^VSBUILD=|^VSDIR=|^SRCNAM=" $CWD/$SBUILD > sbvars -source ./sbvars - -# if no SRCNAM in slackbuild set to PRGNAM -SRCNAM=${SRCNAM:-$PRGNAM} - -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z -cd $SRCNAM-$VERSION/$VSDIR || exit 1 - -if [ ! -e "Cargo.toml" ]; then - echo "No Cargo.toml file in $SRCNAM-$VERSION dir" 1>&2 - exit 1 -elif [ -e "$CWD/Cargo-toml.patch" ]; then - echo "INFO: Applying Cargo.toml patch" - patch -Np1 < $CWD/Cargo-toml.patch -elif [ -e "$CWD/no-git-patch-builds.patch" ]; then - echo "INFO: Applying no-git-patch-builds.patch patch" - patch -Np1 < $CWD/no-git-patch-builds.patch -fi - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i686 ;; - 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" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -# check if rust-opt is installed -if [ ! -d /opt/rust/bin ]; then - echo "ERROR: The rust-opt slackbuild is required to be installed" - exit 1 -else - export PATH="/opt/rust/bin:$PATH" - if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" - else - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" - fi -fi - -# Configure cargo-vendor-filterer -if [ "$(grep -c "^\[package\]$" Cargo.toml)" -eq 1 ]; then - echo "This is a normal cargo package." - SRCTYPE="package" -elif [ "$(grep -c "^\[workspace\]$" Cargo.toml)" -eq 1 ]; then - echo "This is a cargo workspace." - SRCTYPE="workspace" -else - echo "Cargo.toml does not contain [package] or [workspace], exiting." - exit 1 -fi - - cat << EOF >> Cargo.toml -[$SRCTYPE.metadata.vendor-filter] -platforms = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabihf"] -all-features = true -EOF - -if [ -f /usr/bin/cargo-vendor-filterer ]; then - echo "INFO: Creating filtered vendor libs tarball..." - /usr/bin/cargo-vendor-filterer | tee $WORKDIR/tmpconfig.toml -else - echo "WARNING: Creating unfiltered vendor libs tarball!" - cargo vendor | tee $WORKDIR/tmpconfig.toml -fi - -# build would fail if the .a files were removed -#find vendor -type f -a -name \*.a -print0 | xargs -0 rm -f - -# add vendored-sources section generated by cargo-vendor-filterer -mkdir -p .cargo -cat $WORKDIR/tmpconfig.toml >> .cargo/config.toml -cd - - -cd $WORKDIR -echo "Creating vendored tar file..." -tar --totals --checkpoint=100 --checkpoint-action=dot \ - --sort=name --mtime="@0" --owner=0 --group=0 --numeric-owner \ - --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \ - -cJf $CWD/$SRCNAM-vendored-sources-$VERSION-$VSBUILD.tar.xz \ - $SRCNAM-$VERSION/$VSDIR/{vendor,.cargo} -md5sum $CWD/$SRCNAM-vendored-sources-$VERSION-$VSBUILD.tar.xz -cd $CWD -rm -rf $WORKDIR diff --git a/development/cargo-vendor-filterer/cargo-vendor-filterer.SlackBuild b/development/cargo-vendor-filterer/cargo-vendor-filterer.SlackBuild deleted file mode 100644 index fd4349b423..0000000000 --- a/development/cargo-vendor-filterer/cargo-vendor-filterer.SlackBuild +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/bash - -# Copyright 2023-2025 fourtysixandtwo -# Copyright 2022 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2022 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20230925 46and2: Bump build, changes to mkvendored script. -# 20230927 46and2: 32-bit fix thanks to Eugene Carlson. Min ARCH=i686. -# 20240102 46and2: modify to use VSBUILD instead of BUILD for vendored sources -# above requested by Andrew Clemons to avoid CI issues -# -also added VSDIR option to included script, see cargo-mkvendored.sh -# 20240213 46and2: Fix FTB on arm - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=cargo-vendor-filterer -VERSION=${VERSION:-0.5.18} -BUILD=${BUILD:-3} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} -VSBUILD=${VSBUILD:-1} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i686 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -if [ "$ARCH" = "arm" ]; then - TRIPLET="$ARCH-unknown-linux-gnueabihf" -else - TRIPLET="$ARCH-unknown-linux-gnu" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z -tar xvf $CWD/$PRGNAM-vendored-sources-$VERSION-$VSBUILD.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 {} \+ - -export PATH="/opt/rust/bin:$PATH" -if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" -else - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" -fi - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -OPENSSL_NO_VENDOR=1 \ -cargo build \ - --offline \ - --release \ - --target $TRIPLET - -mkdir -p $PKG/usr/bin -install -m 755 target/$TRIPLET/release/cargo-vendor-filterer \ - $PKG/usr/bin/ - -# add script to generate filtered vendor sources -install -m 755 $CWD/cargo-mkvendored.sh $PKG/usr/bin/ - -find $PKG -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 *.md LICENSE \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/cargo-vendor-filterer/cargo-vendor-filterer.info b/development/cargo-vendor-filterer/cargo-vendor-filterer.info deleted file mode 100644 index e3f294f80b..0000000000 --- a/development/cargo-vendor-filterer/cargo-vendor-filterer.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="cargo-vendor-filterer" -VERSION="0.5.18" -HOMEPAGE="https://github.com/coreos/cargo-vendor-filterer" -DOWNLOAD="https://github.com/coreos/cargo-vendor-filterer/archive/v0.5.18/cargo-vendor-filterer-0.5.18.tar.gz \ - https://slackware.uk/~fourtysixandtwo/src/cargo-vendor-filterer-vendored-sources-0.5.18-1.tar.xz" -MD5SUM="fa5e8e4c56ba81b12adf70bcb984e855 \ - 85e04b08ba9625051f98c1967beccdc7" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="rust-opt" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/development/cargo-vendor-filterer/slack-desc b/development/cargo-vendor-filterer/slack-desc deleted file mode 100644 index 1c8d67c1ef..0000000000 --- a/development/cargo-vendor-filterer/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -cargo-vendor-filterer: cargo-vendor-filterer (Vendor rust libraries based on filters) -cargo-vendor-filterer: -cargo-vendor-filterer: cargo-vendor-filterer works like "cargo vendor", but supports filters -cargo-vendor-filterer: that allow excluding libraries one isn't interested in, like -cargo-vendor-filterer: libraries only needed on other platforms, etc. -cargo-vendor-filterer: -cargo-vendor-filterer: Homepage: https://github.com/coreos/cargo-vendor-filterer -cargo-vendor-filterer: -cargo-vendor-filterer: -cargo-vendor-filterer: -cargo-vendor-filterer: diff --git a/development/codelite/codelite.SlackBuild b/development/codelite/codelite.SlackBuild index a73a0361d7..8c14bbd4fd 100644 --- a/development/codelite/codelite.SlackBuild +++ b/development/codelite/codelite.SlackBuild @@ -7,8 +7,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=codelite -VERSION=${VERSION:-15.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-16.0.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/codelite/codelite.info b/development/codelite/codelite.info index c01b8a1ba5..04c9ae1ec9 100644 --- a/development/codelite/codelite.info +++ b/development/codelite/codelite.info @@ -1,8 +1,8 @@ PRGNAM="codelite" -VERSION="15.0" +VERSION="16.0.0" HOMEPAGE="http://www.codelite.org/" -DOWNLOAD="https://github.com/eranif/codelite/archive/15.0/codelite-15.0.tar.gz" -MD5SUM="1c54744ab0c9b5732087687ab17ab49d" +DOWNLOAD="https://github.com/eranif/codelite/archive/16.0.0/codelite-16.0.0.tar.gz" +MD5SUM="0141a38d2f686520d54fd19a6df0fac3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxGTK3" diff --git a/development/edb-debugger/edb-debugger.SlackBuild b/development/edb-debugger/edb-debugger.SlackBuild index 8dc8d3084c..17abe386a1 100644 --- a/development/edb-debugger/edb-debugger.SlackBuild +++ b/development/edb-debugger/edb-debugger.SlackBuild @@ -85,6 +85,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_INSTALL_DATAROOTDIR=/usr/share \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/development/gambas3/gambas-3.19.0-poppler-24.02.0.patch b/development/gambas3/gambas-3.19.0-poppler-24.02.0.patch new file mode 100644 index 0000000000..d97e579696 --- /dev/null +++ b/development/gambas3/gambas-3.19.0-poppler-24.02.0.patch @@ -0,0 +1,13 @@ +diff -Naur gambas-3.19.0.orig/gb.pdf/src/CPdfDocument.cpp gambas-3.19.0/gb.pdf/src/CPdfDocument.cpp +--- gambas-3.19.0.orig/gb.pdf/src/CPdfDocument.cpp 2024-02-16 00:33:51.000000000 +0100 ++++ gambas-3.19.0/gb.pdf/src/CPdfDocument.cpp 2024-02-17 12:14:47.937408267 +0100 +@@ -776,7 +776,8 @@ + BEGIN_PROPERTY(PDFINDEX_title) + + OutlineItem *item = CPDF_index_get(THIS->currindex); +- return_unicode_string(item->getTitle(), item->getTitleLength()); ++ const std::vector &title = item->getTitle(); ++ return_unicode_string(title.data(), title.size()); + + END_PROPERTY + diff --git a/development/gambas3/gambas3.SlackBuild b/development/gambas3/gambas3.SlackBuild index f0c44033c8..386961f4f4 100644 --- a/development/gambas3/gambas3.SlackBuild +++ b/development/gambas3/gambas3.SlackBuild @@ -79,6 +79,8 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 cd $SRCNAM-$VERSION chown -R root:root . +patch -p1 < $CWD/gambas-3.19.0-poppler-24.02.0.patch + ./reconf-all CFLAGS="$SLKCFLAGS" \ diff --git a/development/geany-plugins/geany-plugins.SlackBuild b/development/geany-plugins/geany-plugins.SlackBuild index d5dbff1b8f..47589e20dd 100644 --- a/development/geany-plugins/geany-plugins.SlackBuild +++ b/development/geany-plugins/geany-plugins.SlackBuild @@ -88,7 +88,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 -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/development/geany/geany.SlackBuild b/development/geany/geany.SlackBuild index 5c5c448095..162675d744 100644 --- a/development/geany/geany.SlackBuild +++ b/development/geany/geany.SlackBuild @@ -91,6 +91,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 '/#ifndef SCINTILLATYPES_H/i #include ' scintilla/include/ScintillaTypes.h + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/development/glm/glm.SlackBuild b/development/glm/glm.SlackBuild index 25489fcfff..a69163bfea 100644 --- a/development/glm/glm.SlackBuild +++ b/development/glm/glm.SlackBuild @@ -70,6 +70,7 @@ cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DGLM_TEST_ENABLE=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DGLM_TEST_ENABLE_CXX_11=ON .. make make install DESTDIR=$PKG diff --git a/development/gnuradio/gnuradio.SlackBuild b/development/gnuradio/gnuradio.SlackBuild index d481c4f215..021dff91a1 100644 --- a/development/gnuradio/gnuradio.SlackBuild +++ b/development/gnuradio/gnuradio.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gnuradio -VERSION=${VERSION:-3.10.12.0} +VERSION=${VERSION:-20250930_fba19e1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -69,7 +69,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.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -78,7 +78,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 {} \; -# install docs in the right place +# install docs in the right path sed -i "s|\${GR_DATA_DIR}/doc|doc|" CMakeLists.txt mkdir -p build @@ -87,7 +87,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-deprecated-declarations" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DCMAKE_MODULES_DIR=lib$LIBDIRSUFFIX/cmake/$PRGNAM \ -Wno-dev \ @@ -100,7 +100,7 @@ cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/doc/$PRGNAM-* $PKG/usr/doc/$PRGNAM-$VERSION cp CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md COPYING DCO.txt README.md VERSIONING \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/gnuradio/gnuradio.info b/development/gnuradio/gnuradio.info index 170de0a23e..f32c37a844 100644 --- a/development/gnuradio/gnuradio.info +++ b/development/gnuradio/gnuradio.info @@ -1,10 +1,10 @@ PRGNAM="gnuradio" -VERSION="3.10.12.0" +VERSION="20250930_fba19e1" HOMEPAGE="https://gnuradio.org" -DOWNLOAD="https://github.com/gnuradio/gnuradio/archive/v3.10.12.0/gnuradio-3.10.12.0.tar.gz" -MD5SUM="2230bcaa4d5bbaf9e9b73744b43e8bf3" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/gnuradio-20250930_fba19e1.tar.xz" +MD5SUM="784c21968f45d2260c04f60a5c342552" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="cheetah3 pybind11 volk log4cpp python3-numpy spdlog" +REQUIRES="cheetah3 pybind11 mathjax2 volk log4cpp python3-numpy spdlog" MAINTAINER="Mario Preksavec" EMAIL="mario at slackware dot hr" diff --git a/development/google-go-lang/README b/development/google-go-lang/README deleted file mode 100644 index 0663187522..0000000000 --- a/development/google-go-lang/README +++ /dev/null @@ -1,58 +0,0 @@ -The Go programming language is an open source project to make -programmers more productive. Go is expressive, concise, clean, -and efficient. Its concurrency mechanisms make it easy to write -programs that get the most out of multicore and networked machines, -while its novel type system enables flexible and modular program -construction. Go compiles quickly to machine code yet has the -convenience of garbage collection and the power of run-time -reflection. It's a fast, statically typed, compiled language that -feels like a dynamically typed, interpreted language. - -The tools are added to the path by putting go.sh and go.csh files in -/etc/profile.d and letting the system's /etc/profile or /etc/csh.login -pick it up. If you want to add any of Go's environment variables you -can add them there. - -Also, to easily setup a user-independent path for Go libraries to -be installed to and used, is the GOPATH environment variable. This -variable can be colon delimited. For example, once installing the -built google-go-lang package, then set in your user's ~/.bashrc -something like: - - export GOPATH="$HOME" - -Then, you'll be able to use the `go` command to install an additional -library that will not need root permission and will be in the -compiler's path. Like so: - - go get golang.org/x/tools/cmd/godoc - -Now in ~/src you'll have this source code checked-out, and a binary -built at ~/bin/godoc - -Since the golang idiom is very `go get'able as a limited user, -installed libraries from slackbuilds.org are located outside of GOROOT -(which is only for golang standard library), in /usr/share/gocode By -not setting a system-wide GOPATH defaulting to this location, then -it is up to the user of whether to include this system path as well, -like: - - export GOPATH="$HOME:/usr/share/gocode" - -This system source directory is primarly only for buildtime of -slackbuilds. - -This is because `go get' iterates through the paths provided, looking -for matching imports. If a match is not found, then is cloned to the -first path provided. You would not want this to be a system path, as -to need root privilege to clone source. - -As of go1.2, the 'go doc ...' command has been relocated to the -go.tools library (golang-googlecode-gotools), which provide `godoc`. - -As of go1.5, shared libraries are now supported. The flags to use -linking are available for `go get`, `go install` and `go build`. -To learn more see `go help buildmode`. - -To elect to run the buildtime tests of this package, provide the -environment variable RUN_TEST=true at build time. diff --git a/development/google-go-lang/google-go-lang.SlackBuild b/development/google-go-lang/google-go-lang.SlackBuild deleted file mode 100644 index e4587ba648..0000000000 --- a/development/google-go-lang/google-go-lang.SlackBuild +++ /dev/null @@ -1,383 +0,0 @@ -#!/bin/bash - -# Slackware build script for google-go-lang - -# Written by Eric Schultz eric at schultzter.ca -# Taken over by Vincent Batts vbatts@hashbangbash.com - -# Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2018 Vincent Batts -# Copyright (c) 2012 Eric Schultz -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of -# this software and associated documentation files (the "Software"), to deal in -# the Software without restriction, including without limitation the rights to -# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -# the Software, and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=google-go-lang -VERSION=${VERSION:-1.24.7} -BOOTSTRAP_VERSION=${BOOTSTRAP_VERSION:-1.19.13} -BOOTSTRAP_VERSION2=${BOOTSTRAP_VERSION2:-1.21.13} -BOOTSTRAP_VERSION3=${BOOTSTRAP_VERSION3:-1.23.12} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -RELEASE=${RELEASE:-linux} - -RUN_TEST=${RUN_TEST:-false} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" - GOARCH="386" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" - GOARCH="amd64" -elif [ "$ARCH" = "arm" ]; then - LIBDIRSUFFIX="" - GOARCH="arm" - export GOARM="7" # can be '5' as well, to use soft float instead of hard float -elif [ "$ARCH" = "aarch64" ]; then - LIBDIRSUFFIX="64" - GOARCH="arm64" -else - LIBDIRSUFFIX="" - GOARCH=386 -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG - -CGO_MINOR_VERSION="$(/usr/bin/go version | awk '{ print $3 }' | sed 's/go//' | awk -F. '{ print $2 }')" -if [[ $CGO_MINOR_VERSION -lt 18 ]] ; then - mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION} $OUTPUT - cd $PKG/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION} - tar xvf $CWD/go${BOOTSTRAP_VERSION}.src.tar.gz - cd go - chown -R root:root . - find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - - # as of >= go1.5, the cross-compiler does not need to be bootstrap, so the - # compiler need only be compiled for the host OS, which it detects - unset GOBIN GOPATH GOOS GOARCH - - # Not sure why, but this causes run.bash to fail --rworkman - unset BASH_ENV - - # gcc 5+ is go1.4 API, so we'll bootstrap with it - export GOROOT_BOOTSTRAP="/usr" - - # Default GOROOT is the parent directory of all.bash, - # which is the current directory we're in. - # Defining it here means we can use it below when building - # shared libraries - GOROOT="$(pwd)" - export GOROOT - - # The value of GOROOT once the package is installed - export GOROOT_FINAL="/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION}/go" - - case "$ARCH" in - arm|i?86) export GOMAXPROCS=1 ;; - esac - - cd src - - if [[ "${RUN_TEST}" = "true" ]] ; then - LC_ALL=C \ - ./all.bash - else - LC_ALL=C \ - ./make.bash - fi - - # As of go1.5, golang supports shared libraries, so generate them for use. - $GOROOT/bin/go install -buildmode=shared std - - cd .. - - # remove Go build cache - rm -rf pkg/obj/go-build/* - - # remove the doc Makefile - rm -f doc/Makefile - - mkdir -p $PKG$GOROOT_FINAL -fi - -if [[ $CGO_MINOR_VERSION -lt 20 ]] ; then - mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION2} $OUTPUT - cd $PKG/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION2} - tar xvf $CWD/go${BOOTSTRAP_VERSION2}.src.tar.gz - cd go - chown -R root:root . - find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - - # as of >= go1.5, the cross-compiler does not need to be bootstrap, so the - # compiler need only be compiled for the host OS, which it detects - unset GOBIN GOPATH GOOS GOARCH - - # Not sure why, but this causes run.bash to fail --rworkman - unset BASH_ENV - - # gcc 5+ is go1.4 API, so we'll bootstrap with it - if [[ $CGO_MINOR_VERSION -lt 18 ]] ; then - export GOROOT_BOOTSTRAP="$PKG/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION}/go" - else - export GOROOT_BOOTSTRAP="/usr" - fi - - # Default GOROOT is the parent directory of all.bash, - # which is the current directory we're in. - # Defining it here means we can use it below when building - # shared libraries - GOROOT="$(pwd)" - export GOROOT - - # The value of GOROOT once the package is installed - export GOROOT_FINAL="/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION2}/go" - - case "$ARCH" in - arm|i?86) export GOMAXPROCS=1 ;; - esac - - cd src - - if [[ "${RUN_TEST}" = "true" ]] ; then - LC_ALL=C \ - ./all.bash - else - LC_ALL=C \ - ./make.bash - fi - - # As of go1.5, golang supports shared libraries, so generate them for use. - $GOROOT/bin/go install -buildmode=shared std - - cd .. - - # remove Go build cache - rm -rf pkg/obj/go-build/* - - # remove the doc Makefile - rm -f doc/Makefile - - mkdir -p $PKG$GOROOT_FINAL -fi - -# remove bootstrap -if [[ $CGO_MINOR_VERSION -lt 18 ]] ; then - rm -rf $PKG/usr/lib$LIBDIRSUFFIX/go$BOOTSTRAP_VERSION -fi - -if [[ $CGO_MINOR_VERSION -lt 22 ]] ; then - mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION3} $OUTPUT - cd $PKG/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION3} - tar xvf $CWD/go${BOOTSTRAP_VERSION3}.src.tar.gz - cd go - chown -R root:root . - find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - - # as of >= go1.5, the cross-compiler does not need to be bootstrap, so the - # compiler need only be compiled for the host OS, which it detects - unset GOBIN GOPATH GOOS GOARCH - - # Not sure why, but this causes run.bash to fail --rworkman - unset BASH_ENV - - # gcc 5+ is go1.4 API, so we'll bootstrap with it - if [[ $CGO_MINOR_VERSION -lt 20 ]] ; then - export GOROOT_BOOTSTRAP="$PKG/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION2}/go" - else - export GOROOT_BOOTSTRAP="/usr" - fi - - # Default GOROOT is the parent directory of all.bash, - # which is the current directory we're in. - # Defining it here means we can use it below when building - # shared libraries - GOROOT="$(pwd)" - export GOROOT - - # The value of GOROOT once the package is installed - export GOROOT_FINAL="/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION3}/go" - - case "$ARCH" in - arm|i?86) export GOMAXPROCS=1 ;; - esac - - cd src - - if [[ "${RUN_TEST}" = "true" ]] ; then - LC_ALL=C \ - ./all.bash - else - LC_ALL=C \ - ./make.bash - fi - - # As of go1.5, golang supports shared libraries, so generate them for use. - $GOROOT/bin/go install -buildmode=shared std - - cd .. - - # remove Go build cache - rm -rf pkg/obj/go-build/* - - # remove the doc Makefile - rm -f doc/Makefile - - mkdir -p $PKG$GOROOT_FINAL -fi - -# remove bootstrap -if [[ $CGO_MINOR_VERSION -lt 20 ]] ; then - rm -rf $PKG/usr/lib$LIBDIRSUFFIX/go$BOOTSTRAP_VERSION2 -fi - -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/go${VERSION} $OUTPUT -cd $PKG/usr/lib${LIBDIRSUFFIX}/go${VERSION} -tar xvf $CWD/go${VERSION}.src.tar.gz -cd go -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# as of >= go1.5, the cross-compiler does not need to be bootstrap, so the -# compiler need only be compiled for the host OS, which it detects -unset GOBIN GOPATH GOOS GOARCH - -# Not sure why, but this causes run.bash to fail --rworkman -unset BASH_ENV - -# gcc 5+ is go1.4 API, so we'll bootstrap with it -if [[ $CGO_MINOR_VERSION -lt 22 ]] ; then - export GOROOT_BOOTSTRAP="$PKG/usr/lib${LIBDIRSUFFIX}/go${BOOTSTRAP_VERSION3}/go" -else - export GOROOT_BOOTSTRAP="/usr" -fi - -# Default GOROOT is the parent directory of all.bash, -# which is the current directory we're in. -# Defining it here means we can use it below when building -# shared libraries -GOROOT="$(pwd)" -export GOROOT - -# The value of GOROOT once the package is installed -export GOROOT_FINAL="/usr/lib${LIBDIRSUFFIX}/go${VERSION}/go" - -case "$ARCH" in - arm|i?86) export GOMAXPROCS=1 ;; -esac - -cd src - -if [[ "${RUN_TEST}" = "true" ]] ; then - LC_ALL=C \ - ./all.bash -else - LC_ALL=C \ - ./make.bash -fi - -# As of go1.5, golang supports shared libraries, so generate them for use. -$GOROOT/bin/go install -buildmode=shared std - -find $PKG/$GOROOT_FINAL -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/$GOROOT_FINAL -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null || true - -cd .. - -# remove Go build cache -rm -rf pkg/obj/go-build/* - -# remove the doc Makefile -rm -f doc/Makefile - -# remove tests, nothing needs these at runtime -find $PKG/$GOROOT_FINAL/src -type d -name "testdata" -exec rm -rf {} + -find $PKG/$GOROOT_FINAL/src -type f -name "*_test.go" -exec rm -rf {} + - -mkdir -p $PKG$GOROOT_FINAL - -# remove bootstrap -if [[ $CGO_MINOR_VERSION -lt 22 ]] ; then - rm -rf $PKG/usr/lib$LIBDIRSUFFIX/go$BOOTSTRAP_VERSION3 -fi - -# Put the profile scripts for setting PATH and env variables -mkdir -p $PKG/etc/profile.d -cat > $PKG/etc/profile.d/go.csh << EOF -#!/bin/csh -setenv GOROOT ${GOROOT_FINAL} -setenv PATH \${GOROOT}/bin:\${PATH} -EOF -cat > $PKG/etc/profile.d/go.sh << EOF -#!/bin/sh -export GOROOT="${GOROOT_FINAL}" -export PATH="\${GOROOT}/bin:\${PATH}" -EOF - -chmod 0755 $PKG/etc/profile.d/go.csh -chmod 0755 $PKG/etc/profile.d/go.sh - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CONTRIBUTING.md LICENSE PATENTS README.md SECURITY.md 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 diff --git a/development/google-go-lang/google-go-lang.info b/development/google-go-lang/google-go-lang.info deleted file mode 100644 index 02923ca03d..0000000000 --- a/development/google-go-lang/google-go-lang.info +++ /dev/null @@ -1,16 +0,0 @@ -PRGNAM="google-go-lang" -VERSION="1.24.7" -HOMEPAGE="http://golang.org" -DOWNLOAD="https://storage.googleapis.com/golang/go1.24.7.src.tar.gz \ - https://storage.googleapis.com/golang/go1.23.12.src.tar.gz \ - https://storage.googleapis.com/golang/go1.21.13.src.tar.gz \ - https://storage.googleapis.com/golang/go1.19.13.src.tar.gz" -MD5SUM="52eea261435dcd9fe447ce092f156519 \ - 8b26bb57dd624c3dbddf32c43359bb3d \ - 3454362fc56df5020920e43fee2776ab \ - 6d3625cac26503932002b98eae2d0001" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Vincent Batts" -EMAIL="vbatts@hashbangbash.com" diff --git a/development/google-go-lang/slack-desc b/development/google-go-lang/slack-desc deleted file mode 100644 index 84d7e1d69a..0000000000 --- a/development/google-go-lang/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -google-go-lang: google-go-lang (Google's Go Language kit with gc tool chain) -google-go-lang: -google-go-lang: The Go programming language is an open source project to make -google-go-lang: programmers more productive. Go is expressive, concise, clean, and -google-go-lang: efficient. Its concurrency mechanisms make it easy to write programs -google-go-lang: that get the most out of multicore and networked machines, while its -google-go-lang: novel type system enables flexible and modular program construction. -google-go-lang: -google-go-lang: -google-go-lang: -google-go-lang: diff --git a/development/gtest/README b/development/gtest/README deleted file mode 100644 index d0bacf4248..0000000000 --- a/development/gtest/README +++ /dev/null @@ -1,8 +0,0 @@ -gtest (Google C++ Testing Framework) - -Google's framework for writing C++ tests on a variety of platforms -(Linux, Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based -on the xUnit architecture. Supports automatic test discovery, a rich -set of assertions, user-defined assertions, death tests, fatal and -non-fatal failures, value- and type-parameterized tests, various -options for running the tests, and XML test report generation. diff --git a/development/gtest/gtest.SlackBuild b/development/gtest/gtest.SlackBuild deleted file mode 100644 index bf915c9da7..0000000000 --- a/development/gtest/gtest.SlackBuild +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/bash - -# Slackware build script for gtest - -# 2013-02-12 Bernski Comadizo Cebu -# Copyright 2016-2024 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. - -# 20220415 bkw: Modified by SlackBuilds.org, BUILD=4: -# - install (or actually symlink) docs to /usr/doc/$PRGNAM-$VERSION, -# to follow Slackware standards. -# - install shared libraries with +x permission. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=gtest -SRCNAM=googletest -VERSION=${VERSION:-1.12.1} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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-release-$VERSION -tar -xvf $CWD/$SRCNAM-release-$VERSION.tar.gz -cd $SRCNAM-release-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make -cd .. - -mkdir -p $PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/include/$PRGNAM/internal/custom \ - $PKG/usr/include/gmock/internal/custom - -install -m 0644 googlemock/include/gmock/*.h $PKG/usr/include/gmock -install -m 0644 googlemock/include/gmock/internal/*.h $PKG/usr/include/gmock/internal/ -install -m 0644 googlemock/include/gmock/internal/custom/*.h \ - $PKG/usr/include/gmock/internal/custom - -install -m 0644 googletest/include/$PRGNAM/*.h $PKG/usr/include/$PRGNAM/ -install -m 0644 googletest/include/$PRGNAM/internal/*.h $PKG/usr/include/$PRGNAM/internal/ -install -m 0644 googletest/include/$PRGNAM/internal/custom/*.h \ - $PKG/usr/include/$PRGNAM/internal/custom - -# install the libs and the pkgconfig files! -for i in build/lib/*.so ; do - install -s -m 0755 $i $PKG/usr/lib$LIBDIRSUFFIX/$(basename $i .so).so.$VERSION - ln -s $(basename $i .so).so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/$(basename $i .so).so -done -mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig -for i in gmock gmock_main gtest gtest_main ; do - sed "s| -lpthread||g" build/googletest/generated/${i}.pc \ - > $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/${i}.pc -done - -# copy the cmake files -mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/cmake/GTest -find build/googletest/CMakeFiles/Export build/googletest/generated \ - -name *.cmake -exec cp {} $PKG/usr/lib$LIBDIRSUFFIX/cmake/GTest \; - -mkdir -p $PKG/usr/src -cp -R googlemock $PKG/usr/src -cp -R googletest $PKG/usr/src -# Create symlinks as some programs look for the shorter names -(cd $PKG/usr/src ; ln -svf googlemock gmock ; ln -svf googletest gtest) - -# 20220415 bkw: the docs get installed in /usr/src along with -# everything else. symlink them to a place that slackware users -# expect to see them. -PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKGDOC -cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild -for dir in googlemock googletest; do - mkdir -p $PKGDOC/$dir - for file in CONTRIBUTORS LICENSE README.md docs samples; do - [ -e $PKG/usr/src/$dir/$file ] && ln -s ../../../src/$dir/$file $PKGDOC/$dir - done -done - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/gtest/gtest.info b/development/gtest/gtest.info deleted file mode 100644 index 413fdc2f98..0000000000 --- a/development/gtest/gtest.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gtest" -VERSION="1.12.1" -HOMEPAGE="https://github.com/google/googletest" -DOWNLOAD="https://github.com/google/googletest/archive/release-1.12.1/googletest-release-1.12.1.tar.gz" -MD5SUM="e82199374acdfda3f425331028eb4e2a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="dslackw@gmail.com" diff --git a/development/gtest/slack-desc b/development/gtest/slack-desc deleted file mode 100644 index 46d91bb4fa..0000000000 --- a/development/gtest/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gtest: gtest (Google C++ Testing Framework) -gtest: -gtest: Google's framework for writing C++ tests on a variety of platforms -gtest: (Linux, Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based -gtest: on the xUnit architecture. Supports automatic test discovery, a rich -gtest: set of assertions, user-defined assertions, death tests, fatal and -gtest: non-fatal failures, value- and type-parameterized tests, various -gtest: options for running the tests, and XML test report generation. -gtest: -gtest: Homepage: http://code.google.com/p/googletest -gtest: diff --git a/development/gtkdialog/gtkdialog.SlackBuild b/development/gtkdialog/gtkdialog.SlackBuild index a178b20cae..225474bc0b 100644 --- a/development/gtkdialog/gtkdialog.SlackBuild +++ b/development/gtkdialog/gtkdialog.SlackBuild @@ -64,7 +64,7 @@ find -L . \ # Thanks Gentoo! patch -p1 < $CWD/gtkdialog-0.8.3-fno-common.patch -CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -Wno-return-mismatch" CXXFLAGS="$SLKCFLAGS" \ ./configure --prefix=/usr --infodir=/usr/info make make DESTDIR=$PKG install-strip diff --git a/development/jam/jam.SlackBuild b/development/jam/jam.SlackBuild index f1a115d75a..5c80ee9c98 100644 --- a/development/jam/jam.SlackBuild +++ b/development/jam/jam.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jam -VERSION=${VERSION:-2.5} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.6.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,9 +72,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -mkdir -p $PRGNAM-$VERSION -cd $PRGNAM-$VERSION unzip $CWD/$PRGNAM-$VERSION.zip +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -82,6 +81,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# these are from fedora +for i in $CWD/patches/* ; do patch -p1 < $i ; done + make ./jam0 -sBINDIR=$PKG/usr/bin -sOPTIM="$SLKCFLAGS" install strip --strip-unneeded $PKG/usr/bin/jam diff --git a/development/jam/jam.info b/development/jam/jam.info index ffebdf77ad..7e6015ac5a 100644 --- a/development/jam/jam.info +++ b/development/jam/jam.info @@ -1,8 +1,8 @@ PRGNAM="jam" -VERSION="2.5" -HOMEPAGE="http://public.perforce.com/public/jam/index.html" -DOWNLOAD="https://www.mirrorservice.org/sites/download.salixos.org/x86_64/extra-14.2/source/development/jam/jam-2.5.zip" -MD5SUM="f92caadb62fe4cb0b152eff508c9d450" +VERSION="2.6.1" +HOMEPAGE="https://swarm.workshop.perforce.com/projects/perforce_software-jam" +DOWNLOAD="https://swarm.workshop.perforce.com/downloads/guest/perforce_software/jam/jam-2.6.1.zip" +MD5SUM="6df59f91da8d3c8ab12de22f3b8c1258" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/jam/patches/01_jam-2.5-overflow.patch b/development/jam/patches/01_jam-2.5-overflow.patch new file mode 100644 index 0000000000..d04d3c59e5 --- /dev/null +++ b/development/jam/patches/01_jam-2.5-overflow.patch @@ -0,0 +1,77 @@ +From: Lubomir Rintel +Subject: [PATCH] Fix stack smashing in variable expansion + +Apparently, Fedora's compiler flags were too long for jam's mind, +resulting in out-of-bounds write on stack. This patch increases length +of variable expansion buffer (and filename buffer, just in case) as +well as adds checks for buffer overflows in some places. + +diff -up jam-2.5/expand.c.overflow jam-2.5/expand.c +--- jam-2.5/expand.c.overflow 2003-04-23 06:45:50.000000000 +0200 ++++ jam-2.5/expand.c 2009-07-25 15:59:30.319767119 +0200 +@@ -27,6 +27,7 @@ + * 10/22/02 (seiwald) - list_new() now does its own newstr()/copystr() + * 11/04/02 (seiwald) - const-ing for string literals + * 12/30/02 (armstrong) - fix out-of-bounds access in var_expand() ++ * 25/07/09 (lkundrak@v3.sk) - fix stack overflows in var_expand() + */ + + # include "jam.h" +@@ -283,8 +284,14 @@ var_expand( + + if( colon && edits.filemods ) + var_edit_file( value->string, out, &edits ); +- else ++ else { ++ if( out + strlen( value->string ) > out_buf + sizeof( out_buf ) ) { ++ fprintf( stderr, "ERROR: String longer than %i characters: '%s' + '%s'\n", ++ sizeof( out_buf ), out, value->string ); ++ exit( 1 ); ++ } + strcpy( out, value->string ); ++ } + + if( colon && ( edits.upshift || edits.downshift ) ) + var_edit_shift( out, &edits ); +@@ -298,6 +305,11 @@ var_expand( + ( list_next( value ) || list_next( vars ) ) ) + { + out += strlen( out ); ++ if( out + strlen( edits.join.ptr ) > out_buf + sizeof( out_buf ) ) { ++ fprintf( stderr, "ERROR: String longer than %i characters: '%s' + '%s'\n", ++ sizeof( out_buf ), out, edits.join.ptr ); ++ exit( 1 ); ++ } + strcpy( out, edits.join.ptr ); + out += strlen( out ); + continue; +@@ -320,6 +332,11 @@ var_expand( + + for( rem = remainder; rem; rem = list_next( rem ) ) + { ++ if( out1 + strlen( rem->string ) > out_buf + sizeof( out_buf ) ) { ++ fprintf( stderr, "ERROR: String longer than %i characters: '%s' + '%s'\n", ++ sizeof( out_buf ), out, rem->string ); ++ exit( 1 ); ++ } + strcpy( out1, rem->string ); + l = list_new( l, out_buf, 0 ); + } +diff -up jam-2.5/jam.h.overflow jam-2.5/jam.h +--- jam-2.5/jam.h.overflow 2004-06-23 19:45:36.000000000 +0200 ++++ jam-2.5/jam.h 2009-07-25 15:59:35.464767132 +0200 +@@ -472,8 +472,12 @@ + + /* You probably don't need to muck with these. */ + +-# define MAXSYM 1024 /* longest symbol in the environment */ +-# define MAXJPATH 1024 /* longest filename */ ++# define MAXSYM 65536 /* longest symbol in the environment */ ++# ifdef PATH_MAX ++# define MAXJPATH PATH_MAX /* longest filename */ ++# else ++# define MAXJPATH 4096 ++# endif + + # define MAXJOBS 64 /* silently enforce -j limit */ + # define MAXARGC 32 /* words in $(JAMSHELL) */ diff --git a/development/jam/patches/02_jam-missing-includes.patch b/development/jam/patches/02_jam-missing-includes.patch new file mode 100644 index 0000000000..29dcbb3189 --- /dev/null +++ b/development/jam/patches/02_jam-missing-includes.patch @@ -0,0 +1,49 @@ +Add missing #include directives to support building in strict(er) +C99 mode. + +diff --git a/execunix.c b/execunix.c +index 6cde87a1b008c54a..83bb8978878be294 100644 +--- a/execunix.c ++++ b/execunix.c +@@ -44,6 +44,8 @@ + # include + + # ifdef USE_EXECUNIX ++# include ++# include + + # ifdef OS_OS2 + # define USE_EXECNT +diff --git a/fileunix.c b/fileunix.c +index 41127a293aca58ea..54014b28c92da4d0 100644 +--- a/fileunix.c ++++ b/fileunix.c +@@ -38,6 +38,7 @@ + # include "pathsys.h" + + # ifdef USE_FILEUNIX ++# include + + # if defined( OS_SEQUENT ) || \ + defined( OS_DGUX ) || \ +@@ -51,7 +52,6 @@ + defined( OS_NEXT ) + /* need unistd for rhapsody's proper lseek */ + # include +-# include + # define STRUCT_DIRENT struct direct + # else + # include +diff --git a/make1.c b/make1.c +index b12ca3cef924da3b..c51dabfd58fb7b63 100644 +--- a/make1.c ++++ b/make1.c +@@ -62,6 +62,8 @@ + # include "command.h" + # include "execcmd.h" + ++# include ++ + static void make1a( TARGET *t, TARGET *parent ); + static void make1b( TARGET *t ); + static void make1c( TARGET *t ); diff --git a/development/jam/patches/03_jam-implicit-int.patch b/development/jam/patches/03_jam-implicit-int.patch new file mode 100644 index 0000000000..0a63a2ba66 --- /dev/null +++ b/development/jam/patches/03_jam-implicit-int.patch @@ -0,0 +1,26 @@ +Add missing int types to enable builds in strict(er) C99 mode. + +diff --git a/jam.c b/jam.c +index 4bc1b90ab48d821d..d3c0c83cae05c4cc 100644 +--- a/jam.c ++++ b/jam.c +@@ -166,6 +166,7 @@ extern char **environ; + # endif + # endif + ++int + main( int argc, char **argv, char **arg_environ ) + { + int n; +diff --git a/mkjambase.c b/mkjambase.c +index 26224c977d206cf5..bcad9af1a5ebc866 100644 +--- a/mkjambase.c ++++ b/mkjambase.c +@@ -24,6 +24,7 @@ + # include + # include + ++int + main( int argc, char **argv, char **envp ) + { + char buf[ 1024 ]; diff --git a/development/jam/patches/04_jam-2.5-argv-fixup.patch b/development/jam/patches/04_jam-2.5-argv-fixup.patch new file mode 100644 index 0000000000..56c73b451a --- /dev/null +++ b/development/jam/patches/04_jam-2.5-argv-fixup.patch @@ -0,0 +1,12 @@ +diff -up jam-2.5/execunix.c.fixup jam-2.5/execunix.c +--- jam-2.5/execunix.c.fixup 2024-02-10 07:26:26.720710909 -0500 ++++ jam-2.5/execunix.c 2024-02-10 07:26:47.946025409 -0500 +@@ -104,7 +104,7 @@ execcmd( + { + int pid; + int slot; +- const char *argv[ MAXARGC + 1 ]; /* +1 for NULL */ ++ char * argv[ MAXARGC + 1 ]; /* +1 for NULL */ + + # ifdef USE_EXECNT + char *p; diff --git a/development/jam/patches/05_jam-2.6.1-fix-typo.patch b/development/jam/patches/05_jam-2.6.1-fix-typo.patch new file mode 100644 index 0000000000..92d9a40c0c --- /dev/null +++ b/development/jam/patches/05_jam-2.6.1-fix-typo.patch @@ -0,0 +1,12 @@ +diff -up jam-2.6.1/scan.h.fix-typo jam-2.6.1/scan.h +--- jam-2.6.1/scan.h.fix-typo 2024-09-23 10:57:24.703594933 -0400 ++++ jam-2.6.1/scan.h 2024-09-23 10:57:34.888762530 -0400 +@@ -50,7 +50,7 @@ int yyline(); + int yylex(); + int yyparse(); + const char *yyfname(); +-int yylineo(); ++int yylineno(); + + # define SCAN_NORMAL 0 /* normal parsing */ + # define SCAN_STRING 1 /* look only for matching } */ diff --git a/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild b/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild index 68b8986e71..ef1d953f76 100644 --- a/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild +++ b/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild @@ -64,16 +64,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix /etc/jupyter path -sed 's|etc|/etc|' -i setup.cfg - -python3 setup.py install --root=$PKG +python -m build --wheel --no-isolation --skip-dependency-check +python -m installer --destdir=$PKG dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Remove bundled mathjax2; replace with system mathjax2 -PYTHONPATH=$(python3 -c "from sysconfig import get_path; print(get_path('platlib'))") +PYTHONPATH=$(python3 -c "from sysconfig import get_path; print(get_path('purelib'))") rm -r $PKG/$PYTHONPATH/nbclassic/static/components/MathJax ln -sr /usr/share/mathjax2 $PKG/$PYTHONPATH/nbclassic/static/components/MathJax diff --git a/development/jupyter_server/jupyter_server.info b/development/jupyter_server/jupyter_server.info index 28cb33cd88..ab22dc120e 100644 --- a/development/jupyter_server/jupyter_server.info +++ b/development/jupyter_server/jupyter_server.info @@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jupyter_server/jupyte MD5SUM="8812dfd79f6a8a2dcbefb72cff7503c1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-argon2-cffi jupyter_events jupyter-nbconvert jupyter_server_terminals python3-anyio python3-prometheus_client send2trash python3-overrides python3-websocket-client" +REQUIRES="python3-argon2-cffi jupyter_events jupyter-nbconvert jupyter_server_terminals python3-anyio python3-prometheus_client send2trash python3-websocket-client" MAINTAINER="Isaac Yu" EMAIL="isaacyu@protonmail.com" diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild index ecda75db7b..ab1e734048 100644 --- a/development/kicad/kicad.SlackBuild +++ b/development/kicad/kicad.SlackBuild @@ -82,6 +82,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++ + mkdir -p build cd build cmake \ diff --git a/development/lua/README b/development/lua/README deleted file mode 100644 index a5fc399a8c..0000000000 --- a/development/lua/README +++ /dev/null @@ -1,6 +0,0 @@ -Lua is a free software light-weight programming language designed -for extending applications. Lua is also frequently used as a -general-purpose, stand-alone scripting language. - -This package is for version 5.4.x of lua, the one compatible -with the software that needs lua on slackbuilds.org. diff --git a/development/lua/lua.SlackBuild b/development/lua/lua.SlackBuild deleted file mode 100644 index 9684a035d4..0000000000 --- a/development/lua/lua.SlackBuild +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash - -# Slackware build script for Lua - -# Written by Menno Duursma -# Modified by the SlackBuilds.org project -# Modified by Aaron W. Hsu -# Updated by Matteo Bernardini -# Updated (for lua-5.4) by B. Watson, based on Patrick Volkerding's -# lua.SlackBuild for Slackware-current. - -# This program is free software. It comes without any warranty. -# Granted WTFPL, Version 2, as published by Sam Hocevar. See -# http://sam.zoy.org/wtfpl/COPYING for more details. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=lua -VERSION=${VERSION:-5.4.7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -fi - -set -e - -# 20241017 bkw: this stuff makes the code slightly less eye-hurting. -SHORTVER="$( echo $VERSION | cut -d. -f1,2 )" # e.g. 5.4 -VERMAJOR="$( echo $VERSION | cut -d. -f1 )" # e.g. 5 -LIB=lib$LIBDIRSUFFIX -ULIB=/usr/$LIB -PKGLIB=$PKG$ULIB - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + - -# Also search paths under /usr/local: -patch -p1 < $CWD/lua.usr.local.patch - -# Fix luaconf.h header to use lib$LIBDIRSUFFIX: -sed -i "s|lib/lua|$LIB/lua|" src/luaconf.h - -make linux \ - MYCFLAGS="$SLKCFLAGS" \ - INSTALL_TOP=/usr \ - INSTALL_LIB=$ULIB \ - INSTALL_LMOD=/usr/share/lua/$SHORTVER \ - INSTALL_CMOD=$ULIB/lua/$SHORTVER - -make linux install \ - MYCFLAGS="$SLKCFLAGS" \ - INSTALL_TOP=$PKG/usr \ - INSTALL_LIB=$PKGLIB \ - INSTALL_LMOD=$PKG/usr/share/lua/$SHORTVER \ - INSTALL_CMOD=$PKGLIB/lua/$SHORTVER - -strip $PKG/usr/bin/* - -# Now let's build the shared library -mkdir -p shared -cd shared - ar -x $PKGLIB/liblua.a - gcc -ldl -lreadline -lhistory -lncurses -lm -shared *.o -o liblua.so.$VERSION - install -s -m0755 liblua.so.$VERSION $PKGLIB - ( cd $PKGLIB - ln -s liblua.so.$VERSION liblua.so.$SHORTVER - ln -s liblua.so.$VERSION liblua.so.$VERMAJOR - ln -s liblua.so.$VERSION liblua.so - ) -cd .. - -# and install the pkgconfig file -mkdir -p $PKGLIB/pkgconfig -sed -e "s/%V%/$SHORTVER/" \ - -e "s/%R%/$VERSION/" \ - -e "s/%LIBDIRSUFFIX%/$LIBDIRSUFFIX/g" \ - < $CWD/lua.pc \ - > $PKGLIB/pkgconfig/lua.pc - -gzip -9 $PKG/usr/man/man*/* - -# 20241017 bkw: here is the only real difference between this and PV's: -# we don't create an empty extras/ under the doc dir. -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html -cp -a README* $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/*.html doc/logo.gif doc/lua.css $PKG/usr/doc/$PRGNAM-$VERSION/html -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/lua/lua.info b/development/lua/lua.info deleted file mode 100644 index c87968954e..0000000000 --- a/development/lua/lua.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="lua" -VERSION="5.4.7" -HOMEPAGE="http://www.lua.org" -DOWNLOAD="http://www.lua.org/ftp/lua-5.4.7.tar.gz" -MD5SUM="fc3f3291353bbe6ee6dec85ee61331e8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/development/lua/lua.pc b/development/lua/lua.pc deleted file mode 100644 index dbb94a95c7..0000000000 --- a/development/lua/lua.pc +++ /dev/null @@ -1,31 +0,0 @@ -# lua.pc -- pkg-config data for Lua - -# vars from install Makefile - -# grep '^V=' ../Makefile -V=%V% -# grep '^R=' ../Makefile -R=%R% - -# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' -prefix= /usr -INSTALL_BIN= ${prefix}/bin -INSTALL_INC= ${prefix}/include -INSTALL_LIB= ${prefix}/lib%LIBDIRSUFFIX% -INSTALL_MAN= ${prefix}/man/man1 -INSTALL_LMOD= ${prefix}/share/lua/${V} -INSTALL_CMOD= ${prefix}/lib%LIBDIRSUFFIX%/lua/${V} - -# canonical vars -exec_prefix=${prefix} -libdir=${exec_prefix}/lib%LIBDIRSUFFIX% -includedir=${prefix}/include - -Name: Lua -Description: An Extensible Extension Language -Version: ${R} -Requires: -Libs: -L${libdir} -llua -lm -Cflags: -I${includedir} - -# (end of lua.pc) diff --git a/development/lua/lua.usr.local.patch b/development/lua/lua.usr.local.patch deleted file mode 100644 index 9383c8c478..0000000000 --- a/development/lua/lua.usr.local.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ./src/luaconf.h.orig 2023-05-02 15:02:30.000000000 -0500 -+++ ./src/luaconf.h 2024-02-13 13:04:58.161007318 -0600 -@@ -224,19 +224,28 @@ - #else /* }{ */ - - #define LUA_ROOT "/usr/local/" -+#define LUA_ROOT2 "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" -+#define LUA_LDIR2 LUA_ROOT2 "share/lua/" LUA_VDIR "/" - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" -+#define LUA_CDIR2 LUA_ROOT2 "lib/lua/" LUA_VDIR "/" - - #if !defined(LUA_PATH_DEFAULT) - #define LUA_PATH_DEFAULT \ - LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ -+ LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua;" \ - LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ -+ LUA_CDIR2"?.lua;" LUA_CDIR2"?/init.lua;" \ - "./?.lua;" "./?/init.lua" - #endif - - #if !defined(LUA_CPATH_DEFAULT) - #define LUA_CPATH_DEFAULT \ -- LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so" -+ LUA_CDIR"?.so;" \ -+ LUA_CDIR2"?.so;" \ -+ LUA_CDIR"loadall.so;" \ -+ LUA_CDIR2"loadall.so;" \ -+ "./?.so" - #endif - - #endif /* } */ diff --git a/development/lua/slack-desc b/development/lua/slack-desc deleted file mode 100644 index e12cce2951..0000000000 --- a/development/lua/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -lua: lua (a powerful, fast, light-weight, embeddable scripting language) -lua: -lua: Lua combines simple procedural syntax with powerful data description -lua: constructs based on associative arrays and extensible semantics. -lua: Lua is dynamically typed, runs by interpreting bytecode for a -lua: register-based virtual machine, and has automatic memory management -lua: with incremental garbage collection, making it ideal for -lua: configuration, scripting, and rapid prototyping. -lua: -lua: -lua: diff --git a/development/luajit/README b/development/luajit/README deleted file mode 100644 index 2abcd923af..0000000000 --- a/development/luajit/README +++ /dev/null @@ -1,2 +0,0 @@ -LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming -language. diff --git a/development/luajit/luajit.SlackBuild b/development/luajit/luajit.SlackBuild deleted file mode 100644 index 546316c17a..0000000000 --- a/development/luajit/luajit.SlackBuild +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash - -# Slackware build script for luajit - -# Copyright 2018 Erik Falor , Logan, Utah, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20241117 bkw: Modified by SlackBuilds.org: update for v2.1.1731601260, -# since -current just updated. Lousy timing on my part, sorry. Also, use -# self-hosted source so the URL will survive Pat's next update. - -# 20241106 bkw: Modified by SlackBuilds.org: update for v2.1.1727870382, to -# match Slackware -current. - -# 20241017 bkw: Modified by SlackBuilds.org, BUILD=3: remove lua dep, -# it's *not* required. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=luajit -VERSION=${VERSION:-2.1.1731601260} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.lz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + - -# 20241105 bkw: next 2 stanzas come from Pat V's luajit.SlackBuild from -current. -# Enable Lua 5.2 features: -sed -i -e '/-DLUAJIT_ENABLE_LUA52COMPAT/s/^#//' src/Makefile - -# preserve timestamps: -sed -i -e '/install -m/s/-m/-p -m/' Makefile - -LIB=lib$LIBDIRSUFFIX -USRLIB=/usr/$LIB -MAN1=/usr/man/man1 -PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION - -runmake() { - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - make $1 \ - Q= \ - DESTDIR=$2 \ - PREFIX=/usr \ - MULTILIB=$LIB \ - INSTALL_LIB=$2/$USRLIB \ - INSTALL_MAN=$2/$MAN1 -} - -runmake -runmake install $PKG - -rm -f $PKG/$USRLIB/*.a -strip $PKG/usr/bin/$PRGNAM-$VERSION $PKG/$USRLIB/lib$PRGNAM*.so.$VERSION -gzip -9 $PKG/$MAN1/* - -mkdir -p $PKGDOC -cp -a doc/* COPYRIGHT README $PKGDOC -cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/luajit/luajit.info b/development/luajit/luajit.info deleted file mode 100644 index eb7e6a2a05..0000000000 --- a/development/luajit/luajit.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="luajit" -VERSION="2.1.1731601260" -HOMEPAGE="http://luajit.org/" -DOWNLOAD="https://slackware.uk/~urchlay/src/luajit-2.1.1731601260.tar.lz" -MD5SUM="cffc7f2e051c50f7fa09eaaac5079ded" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Erik Falor" -EMAIL="ewfalor@gmail.com" diff --git a/development/luajit/slack-desc b/development/luajit/slack-desc deleted file mode 100644 index e5b855ef18..0000000000 --- a/development/luajit/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -luajit: luajit (just-in-time compiler for Lua) -luajit: -luajit: LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming -luajit: language. -luajit: -luajit: -luajit: -luajit: -luajit: -luajit: Project Homepage: http://luajit.org/ -luajit: diff --git a/development/medit/medit.SlackBuild b/development/medit/medit.SlackBuild index dc693554ca..b5ec1f6881 100644 --- a/development/medit/medit.SlackBuild +++ b/development/medit/medit.SlackBuild @@ -83,7 +83,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 -std=gnu17 -Wno-incompatible-pointer-types" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ ./configure \ @@ -93,6 +93,7 @@ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --without-python \ --build=$ARCH-slackware-linux make diff --git a/development/mold/README b/development/mold/README deleted file mode 100644 index 71edba8ec6..0000000000 --- a/development/mold/README +++ /dev/null @@ -1,6 +0,0 @@ -mold - a faster drop-in replacement for existing Unix linkers - -It is several times faster than the LLVM lld linker, the -second-fastest open-source linker which was created by the same author -a few years ago. mold is designed to increase developer productivity by -reducing build time, especially in rapid debug-edit-rebuild cycles. diff --git a/development/mold/mold.SlackBuild b/development/mold/mold.SlackBuild deleted file mode 100644 index 05a1bacb28..0000000000 --- a/development/mold/mold.SlackBuild +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -# Slackware build script for mold - -# Copyright 2022 xaizek -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=mold -VERSION=${VERSION:-2.40.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -else - SLKCFLAGS="-O2" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_MANDIR=/usr/man \ - -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -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 - -cp -a \ - README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/mold/mold.info b/development/mold/mold.info deleted file mode 100644 index b7abc61f36..0000000000 --- a/development/mold/mold.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mold" -VERSION="2.40.4" -HOMEPAGE="https://github.com/rui314/mold" -DOWNLOAD="https://github.com/rui314/mold/archive/v2.40.4/mold-2.40.4.tar.gz" -MD5SUM="a7e9856dd8fab0d48617dfff06a8cddd" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="xaizek" -EMAIL="xaizek@posteo.net" diff --git a/development/mold/slack-desc b/development/mold/slack-desc deleted file mode 100644 index 4bb0cae52d..0000000000 --- a/development/mold/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -mold: mold (a faster drop-in replacement for existing Unix linkers) -mold: -mold: It is several times faster than the LLVM lld linker, the -mold: second-fastest open-source linker which was created by the same -mold: author a few years ago. mold is designed to increase developer -mold: productivity by reducing build time, especially in rapid -mold: debug-edit-rebuild cycles. -mold: -mold: -mold: -mold: diff --git a/development/mono/mono.SlackBuild b/development/mono/mono.SlackBuild index 001fa62c3c..8255f3dfa4 100644 --- a/development/mono/mono.SlackBuild +++ b/development/mono/mono.SlackBuild @@ -91,6 +91,8 @@ tar xvf $CWD/$PRGNAM-$BOOTSTRAP-$BOOTSTRAPARCH.tar.bz2 export PATH="$TMP/$PRGNAM-$BOOTSTRAP-$BOOTSTRAPARCH/usr/bin:$PATH" popd +export CMAKE_POLICY_VERSION_MINIMUM=3.5 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/development/nodejs/README b/development/nodejs/README deleted file mode 100644 index 19aa105720..0000000000 --- a/development/nodejs/README +++ /dev/null @@ -1,8 +0,0 @@ -Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. - -Node.js uses an event-driven, non-blocking I/O model that makes it -lightweight and efficient. Node.js' package ecosystem, npm, is the -largest ecosystem of open source libraries in the world. - -NOTE: This version uses an internal OpenSSL version instead of -the one provided in Slackware package. diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild deleted file mode 100644 index 4639f6340d..0000000000 --- a/development/nodejs/nodejs.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# Slackware build script for nodejs -# Thanks to Audrius Kažukauskas - -# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org -# Willy Sudiarto Raharjo - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version, with the following exception: -# the text of the GPL license may be omitted. - -# This program is distributed in the hope that it will be useful, but -# without any warranty; without even the implied warranty of -# merchantability or fitness for a particular purpose. Compiling, -# interpreting, executing or merely reading the text of the program -# may result in lapses of consciousness and/or very being, up to and -# including the end of all existence and the Universe as we know it. -# See the GNU General Public License for more details. - -# You may have received a copy of the GNU General Public License -# along with this program (most likely, a file named COPYING). If -# not, see . - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=nodejs -SRCNAM=node -VERSION=${VERSION:-20.19.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-v$VERSION -tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz -cd $SRCNAM-v$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -## Fix man page path. -sed -i 's|share/||' tools/install.py - -## Fix libdir for 64-bit. -sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py -sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" \ - lib/module.js \ - lib/internal/modules/cjs/loader.js \ - deps/npm/lib/npm.js - -sed -i "s|math.h|cmath|" src/node_crypto.cc -./configure \ - --prefix=/usr \ - --shared-zlib \ - --shared-openssl \ - --ninja - -make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -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 - -## Add bash completion file for npm. -install -D -m 644 $CWD/npm.sh $PKG/usr/share/bash-completion/completions/npm - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/nodejs/nodejs.info b/development/nodejs/nodejs.info deleted file mode 100644 index 00d41c2cc9..0000000000 --- a/development/nodejs/nodejs.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nodejs" -VERSION="20.19.5" -HOMEPAGE="https://nodejs.org/" -DOWNLOAD="https://nodejs.org/dist/v20.19.5/node-v20.19.5.tar.gz" -MD5SUM="86df103ca04a59a618394b016d16c264" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/development/nodejs/npm.sh b/development/nodejs/npm.sh deleted file mode 100644 index 25bef2c17b..0000000000 --- a/development/nodejs/npm.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -###-begin-npm-completion-### -# -# npm command completion script -# -# Installation: npm completion >> ~/.bashrc (or ~/.zshrc) -# Or, maybe: npm completion > /usr/local/etc/bash_completion.d/npm -# - -if type complete &>/dev/null; then - _npm_completion () { - local words cword - if type _get_comp_words_by_ref &>/dev/null; then - _get_comp_words_by_ref -n = -n @ -w words -i cword - else - cword="$COMP_CWORD" - words=("${COMP_WORDS[@]}") - fi - - local si="$IFS" - IFS=$'\n' COMPREPLY=($(COMP_CWORD="$cword" \ - COMP_LINE="$COMP_LINE" \ - COMP_POINT="$COMP_POINT" \ - npm completion -- "${words[@]}" \ - 2>/dev/null)) || return $? - IFS="$si" - } - complete -o default -F _npm_completion npm -elif type compdef &>/dev/null; then - _npm_completion() { - local si=$IFS - compadd -- $(COMP_CWORD=$((CURRENT-1)) \ - COMP_LINE=$BUFFER \ - COMP_POINT=0 \ - npm completion -- "${words[@]}" \ - 2>/dev/null) - IFS=$si - } - compdef _npm_completion npm -elif type compctl &>/dev/null; then - _npm_completion () { - local cword line point words si - read -Ac words - read -cn cword - let cword-=1 - read -l line - read -ln point - si="$IFS" - IFS=$'\n' reply=($(COMP_CWORD="$cword" \ - COMP_LINE="$line" \ - COMP_POINT="$point" \ - npm completion -- "${words[@]}" \ - 2>/dev/null)) || return $? - IFS="$si" - } - compctl -K _npm_completion npm -fi -###-end-npm-completion-### diff --git a/development/nodejs/slack-desc b/development/nodejs/slack-desc deleted file mode 100644 index bb10691042..0000000000 --- a/development/nodejs/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nodejs: nodejs (JavaScript runtime) -nodejs: -nodejs: Node.js is a JavaScript runtime built on Chrome's V8 JavaScript -nodejs: engine. -nodejs: -nodejs: https://nodejs.org/ -nodejs: -nodejs: -nodejs: -nodejs: -nodejs: diff --git a/development/numpy-legacy/numpy-legacy.SlackBuild b/development/numpy-legacy/numpy-legacy.SlackBuild index a96eb39643..8abc50265f 100644 --- a/development/numpy-legacy/numpy-legacy.SlackBuild +++ b/development/numpy-legacy/numpy-legacy.SlackBuild @@ -150,7 +150,7 @@ case "$DEBUG" in esac if [ ! "$DEBUG" ]; then - NPY_RELAXED_STRIDES_CHECKING=${NPY_RSC:-1} python setup.py install --root $PKG + NPY_RELAXED_STRIDES_CHECKING=${NPY_RSC:-1} CFLAGS="-fpermissive" python2 setup.py install --root $PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/development/ocaml/ocaml.SlackBuild b/development/ocaml/ocaml.SlackBuild index a882b4e60b..82c7d7214c 100644 --- a/development/ocaml/ocaml.SlackBuild +++ b/development/ocaml/ocaml.SlackBuild @@ -83,7 +83,7 @@ cd $PRGNAM-$VERSION chown -R root:root . fixperms -sed "s|@CFLAGS@|$SLKCFLAGS|" $CWD/configure.patch | patch -p1 +sed -i "s|-O2 -fno-strict-aliasing -fwrapv|$SLKCFLAGS -std=gnu17|" configure ./configure \ --prefix /usr \ diff --git a/development/oneTBB/includes.patch b/development/oneTBB/includes.patch new file mode 100644 index 0000000000..4e83198618 --- /dev/null +++ b/development/oneTBB/includes.patch @@ -0,0 +1,10 @@ +--- oneTBB-2021.6.0.orig/test/common/utils_assert.h 2023-07-24 20:21:49.362670251 +0900 ++++ oneTBB-2021.6.0/test/common/utils_assert.h 2023-07-24 20:22:27.350547548 +0900 +@@ -19,6 +19,7 @@ + + #include "config.h" + #include "utils_report.h" ++#include + + #define REPORT_FATAL_ERROR REPORT + diff --git a/development/oneTBB/oneTBB.SlackBuild b/development/oneTBB/oneTBB.SlackBuild index f74fb0ca6c..6288ed11c3 100644 --- a/development/oneTBB/oneTBB.SlackBuild +++ b/development/oneTBB/oneTBB.SlackBuild @@ -77,6 +77,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 {} \; +# Missing include +patch -p1 < $CWD/includes.patch +# Remove unused variables (upstream 17b7834, 274f68e) +patch -p1 < $CWD/unused.patch # enable Python if [ "${PYTHON:-no}" == "yes" ];then @@ -85,6 +89,8 @@ fi mkdir -p build cd build +CC=/usr/bin/clang \ +CXX=/usr/bin/clang++ \ cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ diff --git a/development/oneTBB/unused.patch b/development/oneTBB/unused.patch new file mode 100644 index 0000000000..92ab7dd1be --- /dev/null +++ b/development/oneTBB/unused.patch @@ -0,0 +1,39 @@ +--- oneTBB-2021.6.0.orig/test/conformance/conformance_flowgraph.h 2023-12-17 14:34:12.234366082 +0900 ++++ oneTBB-2021.6.0/test/conformance/conformance_flowgraph.h 2023-12-17 15:27:02.512416476 +0900 +@@ -79,8 +79,9 @@ + template + typename std::enable_if::value, std::vector>::type get_values( test_push_receiver& rr ) { + std::vector messages; +- int val = 0; +- for(V tmp(0); rr.try_get(tmp); ++val) { ++ V tmp(0); ++ ++ while (rr.try_get(tmp)) { + messages.push_back(tmp); + } + return messages; +@@ -89,8 +90,9 @@ + template + typename std::enable_if::value, std::vector>::type get_values( test_push_receiver& rr ) { + std::vector messages; +- int val = 0; +- for(V tmp; rr.try_get(tmp); ++val) { ++ V tmp; ++ ++ while (rr.try_get(tmp)) { + messages.push_back(tmp); + } + return messages; +--- oneTBB-2021.6.0.orig/test/conformance/conformance_join_node.cpp 2023-12-17 14:34:12.235366077 +0900 ++++ oneTBB-2021.6.0/test/conformance/conformance_join_node.cpp 2023-12-17 15:45:20.864114506 +0900 +@@ -28,8 +28,8 @@ + + std::vector get_values( conformance::test_push_receiver& rr ) { + std::vector messages; +- int val = 0; +- for(my_input_tuple tmp(0, 0.f, input_msg(0)); rr.try_get(tmp); ++val) { ++ my_input_tuple tmp(0, 0.f, input_msg(0)); ++ while(rr.try_get(tmp)) { + messages.push_back(tmp); + } + return messages; diff --git a/development/opencomal/opencomal.SlackBuild b/development/opencomal/opencomal.SlackBuild index 8860b8bf22..9c42d97dca 100644 --- a/development/opencomal/opencomal.SlackBuild +++ b/development/opencomal/opencomal.SlackBuild @@ -99,7 +99,7 @@ patch -p1 < $CWD/makefile.diff # not 100% sure -j1 is needed, but this is a small program anyway. rm -f src/*.{d,o} -make -j1 -C src PROFILE="$SLKCFLAGS" +make -j1 -C src PROFILE="$SLKCFLAGS -Wno-incompatible-pointer-types" # no 'make install' target. mkdir -p $PKG/usr/bin diff --git a/development/pahole/README b/development/pahole/README deleted file mode 100644 index 364ff6ed67..0000000000 --- a/development/pahole/README +++ /dev/null @@ -1,2 +0,0 @@ -pahole shows data structure layouts encoded in debugging information -formats, DWARF and CTF being supported. diff --git a/development/pahole/pahole.SlackBuild b/development/pahole/pahole.SlackBuild deleted file mode 100644 index 12f7cd8e7c..0000000000 --- a/development/pahole/pahole.SlackBuild +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -# Slackware build script for pahole - -# Copyright 2019-2024 xaizek -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=pahole -VERSION=${VERSION:-1.30} -LIBBPF_VER="${LIBBPF_VER:-6597330c45d185381900037f0130712cd326ae59}" -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -else - SLKCFLAGS="-O2" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -rm -rf libbpf-$LIBBPF_VER -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z -tar xvf $CWD/libbpf-$LIBBPF_VER.tar.?z -rmdir $PRGNAM-$VERSION/lib/bpf -mv libbpf-$LIBBPF_VER $PRGNAM-$VERSION/lib/bpf -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# -DDW_LANG_Haskell is a workaround for macro rename in /usr/include/dwarf.h -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -DDW_LANG_Haskell=DW_LANG_Haskel" \ - -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 - -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 - -# README.ctracer seems to be the only useful README -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING NEWS README.ctracer \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/pahole/pahole.info b/development/pahole/pahole.info deleted file mode 100644 index eb881393ab..0000000000 --- a/development/pahole/pahole.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="pahole" -VERSION="1.30" -HOMEPAGE="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/" -DOWNLOAD="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-1.30.tar.gz \ - https://github.com/libbpf/libbpf/archive/6597330c45d185381900037f0130712cd326ae59/libbpf-6597330c45d185381900037f0130712cd326ae59.tar.gz" -MD5SUM="628ca8ec1bc7bb9ccbcd9bfcaab235ec \ - 85b09e49a18f70056886ab13487231fb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="xaizek" -EMAIL="xaizek@posteo.net" diff --git a/development/pahole/slack-desc b/development/pahole/slack-desc deleted file mode 100644 index 26f5300a20..0000000000 --- a/development/pahole/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pahole: pahole (shows and manipulates program's data structure layout) -pahole: -pahole: pahole shows data structure layouts encoded in debugging information -pahole: formats, DWARF and CTF being supported. -pahole: -pahole: This is useful for, among other things: optimizing important data -pahole: structures by reducing their size, figuring out what is the field -pahole: sitting at an offset from the start of a data structure, investigating -pahole: ABI changes and more generally understanding a new codebase you have -pahole: to work with. -pahole: diff --git a/development/premake5/premake5.SlackBuild b/development/premake5/premake5.SlackBuild index 0774d74d6b..719f4565a4 100644 --- a/development/premake5/premake5.SlackBuild +++ b/development/premake5/premake5.SlackBuild @@ -29,8 +29,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=premake5 -VERSION=${VERSION:-5.0.0_beta2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.0.0_beta4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/premake5/premake5.info b/development/premake5/premake5.info index 3c6bb5f688..3be591bdc5 100644 --- a/development/premake5/premake5.info +++ b/development/premake5/premake5.info @@ -1,8 +1,8 @@ PRGNAM="premake5" -VERSION="5.0.0_beta2" +VERSION="5.0.0_beta4" HOMEPAGE="https://premake.github.io/" -DOWNLOAD="https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-src.zip" -MD5SUM="23b436c9b740f04e57831c76b18b76bf" +DOWNLOAD="https://github.com/premake/premake-core/releases/download/v5.0.0-beta4/premake-5.0.0-beta4-src.zip" +MD5SUM="e8a94ac6d8db6974705a0d2e43f51b83" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/protobuf3/README b/development/protobuf3/README deleted file mode 100644 index 88b024b107..0000000000 --- a/development/protobuf3/README +++ /dev/null @@ -1,30 +0,0 @@ -protobuf3 (Google's data interchange format) - -Protocol buffers are a flexible, efficient, automated mechanism for -serializing structured data. - -This package contains protobuf API version 3. -It support the following language implementations: -* C++ -* Java -* Python -* Objective-C -* C# -* JavaNano -* JavaScript -* Ruby -* Go -* PHP (Alpha) - -The complete documentation for Protocol Buffers is available at: -https://developers.google.com/protocol-buffers/ - -Notes: -* The protobuf build (API version 2) has been removed from - SlackBuilds.org, because nothing uses it any longer and it - conflicted with this build. -* Protobuf3 enforces strict UTF-8 checking. - Parsing will fail if a string field contains non UTF-8 data. -* Protobuf 31.0 dropped support for Ruby 3.0, so 30.0 is the last - version working with Slackware 15.0 if you are working on project - that requires Ruby support. diff --git a/development/protobuf3/protobuf3.SlackBuild b/development/protobuf3/protobuf3.SlackBuild deleted file mode 100644 index e17cbd9887..0000000000 --- a/development/protobuf3/protobuf3.SlackBuild +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/bash - -# Slackware build script for protobuf3 - -# Copyright 2017-2025 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=protobuf3 -VERSION=${VERSION:-32.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -GTEST=googletest-release -GTESTVERSION=${GTESTVERSION:-1.8.1} - -SRCNAM=protobuf - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -patch -p1 < $CWD/soversion.patch - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -Dprotobuf_BUILD_TESTS=OFF \ - -Dprotobuf_ABSL_PROVIDER=package \ - -Dprotobuf_BUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -# Install the python bindings: -tar xvf $CWD/$SRCNAM-6.$VERSION.tar.gz -cd $SRCNAM-6.$VERSION -LDFLAGS+=" -L$TMP/$SRCNAM-$VERSION/build" \ -PROTOC="$TMP/$SRCNAM-$VERSION/build/protoc" \ -python3 -m build --wheel --no-isolation -python3 -m installer --destdir "$PKG" dist/*.whl -cd .. - -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.txt LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/protobuf3/protobuf3.info b/development/protobuf3/protobuf3.info deleted file mode 100644 index c95e74975a..0000000000 --- a/development/protobuf3/protobuf3.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="protobuf3" -VERSION="32.1" -HOMEPAGE="https://github.com/google/protobuf" -DOWNLOAD="https://github.com/google/protobuf/archive/v32.1/protobuf-32.1.tar.gz \ -https://files.pythonhosted.org/packages/fa/a4/cc17347aa2897568beece2e674674359f911d6fe21b0b8d6268cd42727ac/protobuf-6.32.1.tar.gz" -MD5SUM="8feb5c408e0c499de31f920444bc7893 \ -51c692963c93a90caa020f04cd27abbf" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="abseil-cpp python3-build python3-wheel" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/development/protobuf3/slack-desc b/development/protobuf3/slack-desc deleted file mode 100644 index 440a1c6d9a..0000000000 --- a/development/protobuf3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -protobuf3: protobuf3 (Google's data interchange format) -protobuf3: -protobuf3: Protocol Buffers are Google's language-neutral, platform-neutral, -protobuf3: extensible mechanism for serializing structured data. -protobuf3: -protobuf3: This package contains protobuf API version 3. -protobuf3: -protobuf3: -protobuf3: Project URL: https://github.com/google/protobuf -protobuf3: -protobuf3: diff --git a/development/protobuf3/soversion.patch b/development/protobuf3/soversion.patch deleted file mode 100644 index 7e1b42de12..0000000000 --- a/development/protobuf3/soversion.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake -index 9b1de677b4f..276c99c489e 100644 ---- a/cmake/libprotobuf-lite.cmake -+++ b/cmake/libprotobuf-lite.cmake -@@ -30,6 +30,7 @@ if(protobuf_BUILD_SHARED_LIBS) - endif() - set_target_properties(libprotobuf-lite PROPERTIES - VERSION ${protobuf_VERSION} -+ SOVERSION ${protobuf_VERSION_MINOR} - OUTPUT_NAME ${LIB_PREFIX}protobuf-lite - DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") - add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite) -diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake -index aa3efc9a68a..0f34d20b97d 100644 ---- a/cmake/libprotobuf.cmake -+++ b/cmake/libprotobuf.cmake -@@ -33,6 +33,7 @@ if(protobuf_BUILD_SHARED_LIBS) - endif() - set_target_properties(libprotobuf PROPERTIES - VERSION ${protobuf_VERSION} -+ SOVERSION ${protobuf_VERSION_MINOR} - OUTPUT_NAME ${LIB_PREFIX}protobuf - DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") - add_library(protobuf::libprotobuf ALIAS libprotobuf) -diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake -index 72b4a1abb92..91e8bbeb04e 100644 ---- a/cmake/libprotoc.cmake -+++ b/cmake/libprotoc.cmake -@@ -24,6 +24,7 @@ endif() - set_target_properties(libprotoc PROPERTIES - COMPILE_DEFINITIONS LIBPROTOC_EXPORTS - VERSION ${protobuf_VERSION} -+ SOVERSION ${protobuf_VERSION_MINOR} - OUTPUT_NAME ${LIB_PREFIX}protoc - DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") - add_library(protobuf::libprotoc ALIAS libprotoc) diff --git a/development/python3-numpy/README b/development/python3-numpy/README deleted file mode 100644 index f61f1753d2..0000000000 --- a/development/python3-numpy/README +++ /dev/null @@ -1,41 +0,0 @@ -NumPy is a general-purpose array-processing package designed to -efficiently manipulate large multi-dimensional arrays of arbitrary -records without sacrificing too much speed for small multi-dimensional -arrays. NumPy is built on the Numeric code base and adds features -introduced by numarray as well as an extended C-API and the ability to -create arrays of arbitrary type which also makes NumPy suitable for -interfacing with general-purpose data-base applications. - -There are also basic facilities for discrete fourier transform, basic -linear algebra and random number generation. - -If you need to build numpy for debugging, set DEBUG=y. If you use -software which is having problems with numpy's new relaxed strides -checking, set NPY_RSC=0. - -It is highly recommended to install libraries implementing BLAS and -LAPACK before installing numpy. You may choose between: - a) BLAS and LAPACK (unoptimized reference implementation, thus slow) - b) OpenBLAS (optimized, provides LAPACK too) - c) ATLAS and LAPACK (optimized), good to read README.ATLAS -All these are available on SlackBuilds.org. - -If you want to use the UMFPACK library instead of SuperLU to solve -unsymmetric sparse linear systems, then run this Slackbuild with -NO_UMFPACK set to "no" and then install scikit-umfpack on top of -scipy. In this context, UMFPACK is an optional dependency for -numpy. - -IMPORTANT: The version installed by this SlackBuild does NOT include the - oldnumeric and numarray compatibility modules since - (starting with version 1.9.0) these modules were removed by - the numpy developers. If you need these compatibility - modules please consider the numpy-legacy SlackBuild which - is available for python2 only and does not conflict with this - installation of numpy. - -If a particular python3 version is to be used, it may be set using the -PYVER environment variable e.g. - PYVER=3.11 bash python3-numpy.SlackBuild -Otherwise it will use the version linked to by the system python3. - diff --git a/development/python3-numpy/README.ATLAS b/development/python3-numpy/README.ATLAS deleted file mode 100644 index bf8972befa..0000000000 --- a/development/python3-numpy/README.ATLAS +++ /dev/null @@ -1,10 +0,0 @@ -numpy is able to autodetect the ATLAS libraries, but by default will try -to use the shared, threaded ones. It would use something else just if these -are missing. You may force numpy to have another behaviour. - -a) Set just ATLAS_NO_THREADS to "yes". In this case numpy will be forced to - look for the shared, single threaded libs. -b) Set just ATLAS_SHARED to "no". In this case numpy will be forced to look for - the static, threaded ATLAS libraries. -c) Set ATLAS_SHARED to "no" and ATLAS_NO_THREADS to "yes". In this case numpy - will be forced to look for the static, single threaded ATLAS libraries. diff --git a/development/python3-numpy/python3-numpy.SlackBuild b/development/python3-numpy/python3-numpy.SlackBuild deleted file mode 100644 index 37fda0775c..0000000000 --- a/development/python3-numpy/python3-numpy.SlackBuild +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-numpy - -# Copyright 2015-2024 Christoph Willing Sydney, Australia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Based with thanks on original numpy scripts by -# Aleksandar Samardzic and Serban Udrea - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-numpy -SRCNAM=numpy -VERSION=${VERSION:-1.26.3} -BUILD=${BUILD:-3} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -LIBDIRSUFFIX="" -if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -PYVER=${PYVER:-$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')} -# 46and2: needed to fix issue caused by python3-pyproject-metadata 0.9.1 upgrade -# newer python3-packaging-opt needs to be used -export PYTHONPATH=/opt/python$PYVER/site-packages -which python$PYVER 2>/dev/null 1>/dev/null -[ "$?" = "0" ] || { - echo "Can't find python$PYVER. Exiting now ..." - exit 1 -} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xf $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 {} \; - -# You may want to force numpy to link against a special kind of ATLAS -# -ATLAS_SHARED="${ATLAS_SHARED:-yes}" -ATLAS_SHARED=$(echo "$ATLAS_SHARED"|cut -b 1|tr a-z A-Z) -ATLAS_NO_THREADS="${ATLAS_NO_THREADS:-no}" -ATLAS_NO_THREADS=$(echo "$ATLAS_NO_THREADS"|cut -b 1|tr a-z A-Z) - -if [ "$ATLAS_SHARED" = "Y" ]; then - if [ "$ATLAS_NO_THREADS" = "Y" ]; then - echo -e "[atlas]\natlas_libs = satlas" >> site.cfg - echo -e "lapack_libs = satlas\nlapack_atlas = satlas\n" >> site.cfg - fi -else - if [ "$ATLAS_NO_THREADS" = "Y" ]; then - echo -e "[atlas]\natlas_libs = f77blas,cblas,atlas" >> site.cfg - echo -e "lapack_libs = lapack\nlapack_atlas = lapack\n" >> site.cfg - else - echo -e "[atlas]\natlas_libs = ptf77blas,ptcblas,atlas" >> site.cfg - echo -e "lapack_libs = ptlapack\nlapack_atlas = ptlapack\n" >> site.cfg - fi -fi - -NO_UMFPACK=${NO_UMFPACK:-yes} -case "$NO_UMFPACK" in - [yY]|[yY][eE][sS]) NO_UMFPACK="y" ;; - *) NO_UMFPACK="" ;; -esac - -if [ ! "$NO_UMFPACK" ]; then - echo -e "[amd]\nlibrary_dirs = /usr/lib${LIBDIRSUFFIX}" >> site.cfg - echo -e "include_dirs = /usr/include/amd\namd_libs = amd\n" >> site.cfg - echo -e "[umfpack]\nlibrary_dirs = /usr/lib${LIBDIRSUFFIX}" >> site.cfg - echo -e "include_dirs = /usr/include/umfpack\numfpack_libs = umfpack\n" \ - >> site.cfg -fi - -DEBUG=${DEBUG:-no} -case "$DEBUG" in - [yY]|[yY][eE][sS]) DEBUG="y" ;; - *) DEBUG="" ;; -esac - -if [ ! "$DEBUG" ]; then - NPY_RELAXED_STRIDES_CHECKING=${NPY_RSC:-1} python$PYVER -m build --wheel --no-isolation -Csetup-args="-Dallow-noblas=true" - python$PYVER -m installer -d "$PKG" dist/*.whl - - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -else - #NPY_RELAXED_STRIDES_CHECKING=${NPY_RSC:-1} python$PYVER setup.py build --debug - #python$PYVER setup.py install --root $PKG - echo "debug here" -fi - -mkdir -p $PKG/usr/include -cd $PKG/usr/include - # Location varies according to VERSION in 15.0 & -current - if [ -x /usr/bin/gcc-11.* ]; then - ln -s $(ls -d /usr/lib${LIBDIRSUFFIX}/python$PYVER/site-packages)/numpy/core/include/numpy - else - ln -s $(ls -d /usr/lib${LIBDIRSUFFIX}/python$PYVER/site-packages)/numpy/_core/include/numpy - fi -cd - - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CITATION.bib INSTALL.rst LICENSE.txt README.md THANKS.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 {} \; - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/python3-numpy/python3-numpy.info b/development/python3-numpy/python3-numpy.info deleted file mode 100644 index add0e1df47..0000000000 --- a/development/python3-numpy/python3-numpy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-numpy" -VERSION="1.26.3" -HOMEPAGE="https://www.numpy.org/" -DOWNLOAD="https://github.com/numpy/numpy/releases/download/v1.26.3/numpy-1.26.3.tar.gz" -MD5SUM="1c915dc6c36dd4c674d9379e9470ff8b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-mesonpy" -MAINTAINER="Christoph Willing" -EMAIL="chris.willing@linux.com" diff --git a/development/python3-numpy/slack-desc b/development/python3-numpy/slack-desc deleted file mode 100644 index 77313d1d8f..0000000000 --- a/development/python3-numpy/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-numpy: python3-numpy (Python3 extension for scientific computing) -python3-numpy: -python3-numpy: NumPy is an extension to the Python programming language, adding -python3-numpy: support for large, multi-dimensional arrays and matrices along -python3-numpy: with a large library of high-level mathematical functions to -python3-numpy: operate on these arrays. -python3-numpy: -python3-numpy: This packages contains NumPy for python3 -python3-numpy: -python3-numpy: Homepage: http://www.numpy.org/ -python3-numpy: diff --git a/development/ragel/ragel.SlackBuild b/development/ragel/ragel.SlackBuild index 083354d312..2466b66a57 100644 --- a/development/ragel/ragel.SlackBuild +++ b/development/ragel/ragel.SlackBuild @@ -88,6 +88,8 @@ if [ "$LIBDIRSUFFIX" = "64" ]; then patch --verbose -p1 -i $CWD/lib64.patch fi patch --verbose -p1 -i $CWD/shared-colm.patch +sed -i s/1.16/1.18/ Makefile.in +autoreconf -fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/development/rstudio-desktop/README b/development/rstudio-desktop/README index 580b6c582b..a7a291662f 100644 --- a/development/rstudio-desktop/README +++ b/development/rstudio-desktop/README @@ -1,6 +1,6 @@ RStudio IDE: the most popular coding environment for R -the RStudio integrated development environment (IDE) is a set of tools +The RStudio integrated development environment (IDE) is a set of tools built to help you be more productive with R and Python. It includes a console, syntax-highlighting editor that supports direct code execution. It also features tools for plotting, viewing history, debugging and @@ -21,11 +21,6 @@ version, featuring: At the moment, the script just repackages the Fedora/Redhat binaries, provided by upstream. -NOTE 1: +NOTE: RStudio currently only supports 64-bit systems. The last 32-bit version is 1.1.463, provided by "rstudio-desktop-legacy", available at SBo. - -NOTE 2: -RStudio 2024.12.1+563 is the last available version for Slackware 15.0. -Newer versions require openssl >= 3 (for context, Slackware 15.0 has -openssl 1.1.1.) diff --git a/development/rstudio-desktop/rstudio-desktop.SlackBuild b/development/rstudio-desktop/rstudio-desktop.SlackBuild index bf7783aba5..3584aa3d69 100644 --- a/development/rstudio-desktop/rstudio-desktop.SlackBuild +++ b/development/rstudio-desktop/rstudio-desktop.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rstudio-desktop -VERSION=${VERSION:-2024.12.1+563} +VERSION=${VERSION:-2025.05.1+513} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/rstudio-desktop/rstudio-desktop.info b/development/rstudio-desktop/rstudio-desktop.info index dee4353f4f..147d7d8f6f 100644 --- a/development/rstudio-desktop/rstudio-desktop.info +++ b/development/rstudio-desktop/rstudio-desktop.info @@ -1,10 +1,10 @@ PRGNAM="rstudio-desktop" -VERSION="2024.12.1+563" +VERSION="2025.05.1+513" HOMEPAGE="https://posit.co/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download1.rstudio.org/electron/rhel8/x86_64/rstudio-2024.12.1-563-x86_64.rpm" -MD5SUM_x86_64="0dc8e0d0a2f54c22d3475dfba667a563" +DOWNLOAD_x86_64="https://download1.rstudio.org/electron/rhel9/x86_64/rstudio-2025.05.1-513-x86_64.rpm" +MD5SUM_x86_64="c653e3d692a6b85f654b6168eec838d1" REQUIRES="R" MAINTAINER="Isaac Yu" EMAIL="isaacyu@protonmail.com" diff --git a/development/rust-opt/README b/development/rust-opt/README deleted file mode 100644 index 629c000426..0000000000 --- a/development/rust-opt/README +++ /dev/null @@ -1,21 +0,0 @@ -rust-opt installs a limited set of Rust stable binaries to /opt/rust. -This is to allow Rust-based SlackBuilds to build more recent versions -than would be possible with system Rust. - -To use the rust-opt binaries in a SlackBuild, make the following export -statements: - -export PATH="/opt/rust/bin:$PATH" -if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" -else - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" -fi - -If your SlackBuild experiences build failures on 64-bit systems, please -ensure that the LIBDIRSUFFIX variable is set. - -rust-opt is not intended as a substitute for rustup or for the Slackware -Rust package in terms of Rust development purposes. - -Separate downloads are available for x86_64, i686 and ARM. diff --git a/development/rust-opt/rust-opt.SlackBuild b/development/rust-opt/rust-opt.SlackBuild deleted file mode 100644 index dc5d3420cc..0000000000 --- a/development/rust-opt/rust-opt.SlackBuild +++ /dev/null @@ -1,139 +0,0 @@ -#!/bin/bash - -# Slackware build script for rust-opt - -# Copyright 2024-2025 K. Eugene Carlson Tsukuba, Japan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=rust-opt -SRCNAM=rust -VERSION=${VERSION:-1.89.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac - - if [ "$ARCH" = "i586" ]; then - if rustc -Vv | grep host | grep -q i686; then - ARCH=i686 - fi - fi -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -if [ "$ARCH" = "arm" ]; then - TRIPLET="$ARCH-unknown-linux-gnueabihf" -else - TRIPLET="$ARCH-unknown-linux-gnu" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION-$TRIPLET -tar xvf $CWD/$SRCNAM-$VERSION-$TRIPLET.tar.gz -cd $SRCNAM-$VERSION-$TRIPLET - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -sed -i "s/PREFIX\/lib/PREFIX\/lib$LIBDIRSUFFIX/g" install.sh -./install.sh \ - --destdir=$PKG \ - --prefix="opt/$SRCNAM" \ - --disable-ldconfig \ - --without=clippy-preview,\ -llvm-bitcode-linker-preview,\ -llvm-tools-preview,\ -rust-analysis-$TRIPLET,\ -rust-analyzer-preview,\ -rust-docs,\ -rust-docs-json-preview,\ -rustfmt-preview - -find $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null -find $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX -type f -name "*.so*stable" -exec chmod +x {} \; 2> /dev/null - -# Stripping the libraries causes memory faults on Slackware64-15.0. -if [ $ARCH = "x86_64" ]; then - find $PKG -print0 | xargs -0 file | grep "executable" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -else - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -fi - -rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/uninstall.sh -rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/install.log -rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/manifest-* -rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/rust-installer-version -rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/components - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - $PKG/opt/$SRCNAM/share/doc/* \ - COPYRIGHT LICENSE-APACHE LICENSE-MIT \ - $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc/$PRGNAM-$VERSION -name "*.old" -delete -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.sw - -# Nothing in share is needed at this point. -rm -rf $PKG/opt/$SRCNAM/share -# Don't need bash completions. -rm -rf $PKG/opt/$SRCNAM/etc - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/rust-opt/rust-opt.info b/development/rust-opt/rust-opt.info deleted file mode 100644 index f5c4082161..0000000000 --- a/development/rust-opt/rust-opt.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="rust-opt" -VERSION="1.89.0" -HOMEPAGE="https://rust-lang.org" -DOWNLOAD="https://static.rust-lang.org/dist/2025-08-07/rust-1.89.0-i686-unknown-linux-gnu.tar.gz \ - https://static.rust-lang.org/dist/2025-08-07/rust-1.89.0-arm-unknown-linux-gnueabihf.tar.gz" -MD5SUM="371ded03468db5a803b03d282ddf156c \ - d2123e53b49308773e227f1eb44bd5bd" -DOWNLOAD_x86_64="https://static.rust-lang.org/dist/2025-08-07/rust-1.89.0-x86_64-unknown-linux-gnu.tar.gz" -MD5SUM_x86_64="03fe43e1e0808c17d536f69698039a6b" -REQUIRES="" -MAINTAINER="K. Eugene Carlson" -EMAIL="kvngncrlsn@gmail.com" diff --git a/development/rust-opt/slack-desc b/development/rust-opt/slack-desc deleted file mode 100644 index 2d94caa72c..0000000000 --- a/development/rust-opt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -rust-opt: rust-opt (Rust: a safe, concurrent, practical language) -rust-opt: -rust-opt: rust-opt installs a limited set of up-to-date Rust stable binaries to -rust-opt: /opt/rust for use in SlackBuilds. -rust-opt: -rust-opt: See /usr/doc/rust-opt-1.89.0/README.sw for usage instructions. -rust-opt: -rust-opt: -rust-opt: -rust-opt: -rust-opt: Homepage: https://rust-lang.org diff --git a/development/rust16/README b/development/rust16/README deleted file mode 100644 index 568400110d..0000000000 --- a/development/rust16/README +++ /dev/null @@ -1,22 +0,0 @@ -rust16 installs a limited set of Rust 1.79.0 binaries to /opt/rust16. -This is to allow Rust-based SlackBuilds requiring version 1.79.0 to -build on release Slackware. For other Rust software, please use -rust-opt instead. - -To use the rust16 binaries in a SlackBuild, make the following export -statements: - -export PATH="/opt/rust16/bin:$PATH" -if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" -else - export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" -fi - -If your SlackBuild experiences build failures on 64-bit systems, please -ensure that the LIBDIRSUFFIX variable is set. - -rust16 is not intended as a substitute for rustup or for the Slackware -Rust package in terms of Rust development purposes. - -Separate downloads are available for i686 and x86_64. diff --git a/development/rust16/rust16.SlackBuild b/development/rust16/rust16.SlackBuild deleted file mode 100644 index bf7e04f9c6..0000000000 --- a/development/rust16/rust16.SlackBuild +++ /dev/null @@ -1,142 +0,0 @@ -#!/bin/bash - -# Slackware build script for rust16 - -# Copyright 2023-2024 K. Eugene Carlson Tsukuba, Japan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=rust16 -SRCNAM=rust -VERSION=${VERSION:-1.79.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac - - if [ "$ARCH" = "i586" ]; then - if rustc -Vv | grep host | grep -q i686; then - ARCH=i686 - fi - fi -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -if [ "$ARCH" = "arm" ]; then - TRIPLET="$ARCH-unknown-linux-gnueabihf" -else - TRIPLET="$ARCH-unknown-linux-gnu" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION-$TRIPLET -tar xvf $CWD/$SRCNAM-$VERSION-$TRIPLET.tar.gz -cd $SRCNAM-$VERSION-$TRIPLET -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -./install.sh \ - --destdir=$PKG \ - --prefix="opt/rust16" \ - --disable-ldconfig \ - --without=rust-docs-json-preview,\ -rust-docs,\ -clippy-preview,\ -rls-preview,\ -llvm-tools-preview,\ -llvm-bitcode-linker-preview,\ -rust-analysis-$TRIPLET,\ -rust-analyzer-preview,\ -rust-demangler-preview,\ -rustfmt-preview - -find $PKG/opt/$PRGNAM/lib -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null || true -find $PKG/opt/$PRGNAM/lib -type f -name "*.so*stable" -exec chmod +x {} \; 2> /dev/null || true -# Stripping the libraries causes memory faults on Slackware64-15.0. -if [ $ARCH = "x86_64" ]; then - find $PKG -print0 | xargs -0 file | grep "executable" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -else - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -fi - -rm -f $PKG/opt/$PRGNAM/lib/rustlib/uninstall.sh -rm -f $PKG/opt/$PRGNAM/lib/rustlib/install.log -rm -f $PKG/opt/$PRGNAM/lib/rustlib/manifest-* -rm -f $PKG/opt/$PRGNAM/lib/rustlib/rust-installer-version -rm -f $PKG/opt/$PRGNAM/lib/rustlib/components - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - $PKG/opt/$PRGNAM/share/doc/* \ - COPYRIGHT LICENSE-APACHE LICENSE-MIT \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.sw - -# Nothing in share is needed at this point. -rm -rf $PKG/opt/$PRGNAM/share -# Don't need bash completions. -rm -rf $PKG/opt/$PRGNAM/etc -# Appropriate directory name for the lib dir. -[ -n "$LIBDIRSUFFIX" ] && mv $PKG/opt/$PRGNAM/lib $PKG/opt/$PRGNAM/lib$LIBDIRSUFFIX - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/rust16/rust16.info b/development/rust16/rust16.info deleted file mode 100644 index 43d765fe6f..0000000000 --- a/development/rust16/rust16.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="rust16" -VERSION="1.79.0" -HOMEPAGE="https://rust-lang.org" -DOWNLOAD="https://static.rust-lang.org/dist/2024-06-13/rust-1.79.0-i686-unknown-linux-gnu.tar.gz \ - https://static.rust-lang.org/dist/2024-06-13/rust-1.79.0-arm-unknown-linux-gnueabihf.tar.gz" -MD5SUM="14d04dfa5b8db0e4c60b3ca510413154 \ - b935f3d193c8618d9bfe3ab97ad99d4e" -DOWNLOAD_x86_64="https://static.rust-lang.org/dist/2024-06-13/rust-1.79.0-x86_64-unknown-linux-gnu.tar.gz" -MD5SUM_x86_64="6f2d7072b8bcd817f9effa0c504e31e9" -REQUIRES="" -MAINTAINER="K. Eugene Carlson" -EMAIL="kvngncrlsn@gmail.com" diff --git a/development/rust16/slack-desc b/development/rust16/slack-desc deleted file mode 100644 index 1b21a06dce..0000000000 --- a/development/rust16/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -rust16: rust16 (Rust: a safe, concurrent, practical language) -rust16: -rust16: rust16 installs a limited set of Rust 1.79.0 binaries to /opt/rust16 -rust16: for use in SlackBuilds. -rust16: -rust16: -rust16: -rust16: -rust16: -rust16: -rust16: Homepage: https://rust-lang.org diff --git a/development/snappy/73.patch b/development/snappy/73.patch deleted file mode 100644 index 20f7bfada6..0000000000 --- a/development/snappy/73.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 89342ecf34894461cc64c9cbe3f8bc0d18df5073 Mon Sep 17 00:00:00 2001 -From: "liangyukun.lyk" -Date: Mon, 27 Aug 2018 18:08:46 +0800 -Subject: [PATCH] fix cmake build error - ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 41a2124..2a822dd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -145,6 +145,9 @@ if(SNAPPY_BUILD_TESTS) - target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H) - target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES}) - -+ if(HAVE_GTEST) -+ target_link_libraries(snappy_unittest gtest) -+ endif(HAVE_GTEST) - if(HAVE_LIBZ) - target_link_libraries(snappy_unittest z) - endif(HAVE_LIBZ) diff --git a/development/snappy/patches/cmake_add_pkgconfig.patch b/development/snappy/patches/cmake_add_pkgconfig.patch new file mode 100644 index 0000000000..6c3952bdf1 --- /dev/null +++ b/development/snappy/patches/cmake_add_pkgconfig.patch @@ -0,0 +1,24 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,6 +187,12 @@ + "${PROJECT_BINARY_DIR}/config.h" + ) + ++configure_file( ++ "${CMAKE_CURRENT_SOURCE_DIR}/snappy.pc.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/snappy.pc" ++ @ONLY ++) ++ + # We don't want to define HAVE_ macros in public headers. Instead, we use + # CMake's variable substitution with 0/1 variables, which will be seen by the + # preprocessor as constants. +@@ -395,4 +401,8 @@ + "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" + ) ++ install( ++ FILES "${PROJECT_BINARY_DIR}/snappy.pc" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" ++ ) + endif(SNAPPY_INSTALL) diff --git a/development/snappy/patches/use_system_gtest.patch b/development/snappy/patches/use_system_gtest.patch new file mode 100644 index 0000000000..24b49573b3 --- /dev/null +++ b/development/snappy/patches/use_system_gtest.patch @@ -0,0 +1,27 @@ +diff --unified --recursive --text --new-file snappy-1.2.1.orig/CMakeLists.txt snappy-1.2.1/CMakeLists.txt +--- snappy-1.2.1.orig/CMakeLists.txt 2024-09-25 22:35:44.563365640 +0200 ++++ snappy-1.2.1/CMakeLists.txt 2024-09-25 22:40:22.273395168 +0200 +@@ -331,19 +331,18 @@ + set(install_gmock OFF) + set(build_gmock ON) + +- # This project is tested using GoogleTest. +- add_subdirectory("third_party/googletest") ++ find_package(GTest REQUIRED) + + # GoogleTest triggers a missing field initializers warning. + if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- set_property(TARGET gtest ++ set_property(TARGET GTest::gtest + APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- set_property(TARGET gmock ++ set_property(TARGET GTest::gmock + APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) + endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) + + if(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION) +- set_property(TARGET gtest ++ set_property(TARGET GTest::gtest + APPEND PROPERTY COMPILE_OPTIONS -Wno-implicit-int-float-conversion) + endif(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION) + diff --git a/development/snappy/snappy.SlackBuild b/development/snappy/snappy.SlackBuild index 36dc4c7a2f..c24ddf13b6 100644 --- a/development/snappy/snappy.SlackBuild +++ b/development/snappy/snappy.SlackBuild @@ -6,8 +6,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=snappy -VERSION=${VERSION:-1.1.8} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.2.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -19,10 +19,6 @@ if [ -z "$ARCH" ]; then esac fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -62,8 +58,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix build with gtest installed -patch -p1 < $CWD/73.patch +sed "s|@LIBDIRSUFFIX@|$LIBDIRSUFFIX|" $CWD/$PRGNAM.pc.in > $PRGNAM.pc.in +patch -p1 < $CWD/patches/cmake_add_pkgconfig.patch + +patch -p1 < $CWD/patches/use_system_gtest.patch mkdir -p build cd build @@ -73,6 +71,9 @@ cmake \ -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_SHARED_LIBS=ON \ + -DSNAPPY_BUILD_BENCHMARKS=OFF \ + -DCMAKE_CXX_STANDARD=23 \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ .. make diff --git a/development/snappy/snappy.info b/development/snappy/snappy.info index 54ddf0655e..ff66c75964 100644 --- a/development/snappy/snappy.info +++ b/development/snappy/snappy.info @@ -1,8 +1,8 @@ PRGNAM="snappy" -VERSION="1.1.8" +VERSION="1.2.2" HOMEPAGE="https://github.com/google/snappy" -DOWNLOAD="https://github.com/google/snappy/archive/1.1.8/snappy-1.1.8.tar.gz" -MD5SUM="70e48cba7fecf289153d009791c9977f" +DOWNLOAD="https://github.com/google/snappy/archive/1.2.2/snappy-1.2.2.tar.gz" +MD5SUM="30286dd6311dee1d5498c57f62eda7b8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/snappy/snappy.pc.in b/development/snappy/snappy.pc.in new file mode 100644 index 0000000000..9e87e2c740 --- /dev/null +++ b/development/snappy/snappy.pc.in @@ -0,0 +1,10 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib@LIBDIRSUFFIX@ +includedir=${prefix}/include + +Name: snappy +Description: Fast compressor/decompressor library. +Version: @PROJECT_VERSION@ +Libs: -L${libdir} -lsnappy +Cflags: -I${includedir} diff --git a/development/splint/splint.SlackBuild b/development/splint/splint.SlackBuild index e7cf5025a8..1f0b956521 100644 --- a/development/splint/splint.SlackBuild +++ b/development/splint/splint.SlackBuild @@ -67,10 +67,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 {} \; -automake --add-missing || true -autoreconf || true -automake --add-missing -autoreconf +autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/development/systemtap/int.patch b/development/systemtap/int.patch deleted file mode 100644 index b412a51894..0000000000 --- a/development/systemtap/int.patch +++ /dev/null @@ -1,48 +0,0 @@ -Lockywolf - -diff -Naur systemtap-4.5.orig/staprun/monitor.c systemtap-4.5/staprun/monitor.c ---- systemtap-4.5.orig/staprun/monitor.c 2021-05-07 21:20:39.000000000 +0200 -+++ systemtap-4.5/staprun/monitor.c 2021-10-15 11:57:04.770964000 +0200 -@@ -448,12 +448,12 @@ - if (active_window == 0) - wattron(status, A_BOLD); - wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n", -- width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), -- width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), -- width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), -- width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), -- width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), -- width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), -+ (int)width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), -+ (int)width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), -+ (int)width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), -+ (int)width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), -+ (int)width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), -+ (int)width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), - HIGHLIGHT("name", p_name, comp_fn_index)); - if (active_window == 0) - wattroff(status, A_BOLD); -@@ -466,17 +466,17 @@ - json_object *probe, *field; - probe = json_object_array_get_idx(jso_probe_list, i); - json_object_object_get_ex(probe, "index", &field); -- wprintw(status, "%*s\t", width[p_index], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_index], json_object_get_string(field)); - json_object_object_get_ex(probe, "state", &field); -- wprintw(status, "%*s\t", width[p_state], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_state], json_object_get_string(field)); - json_object_object_get_ex(probe, "hits", &field); -- wprintw(status, "%*s\t", width[p_hits], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_hits], json_object_get_string(field)); - json_object_object_get_ex(probe, "min", &field); -- wprintw(status, "%*s\t", width[p_min], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_min], json_object_get_string(field)); - json_object_object_get_ex(probe, "avg", &field); -- wprintw(status, "%*s\t", width[p_avg], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_avg], json_object_get_string(field)); - json_object_object_get_ex(probe, "max", &field); -- wprintw(status, "%*s\t", width[p_max], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_max], json_object_get_string(field)); - getyx(status, discard, cur_x); - json_object_object_get_ex(probe, "name", &field); - wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field)); diff --git a/development/systemtap/systemtap.SlackBuild b/development/systemtap/systemtap.SlackBuild index 62eff9de5b..8e3c6604f8 100644 --- a/development/systemtap/systemtap.SlackBuild +++ b/development/systemtap/systemtap.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=systemtap -VERSION=${VERSION:-4.5} +VERSION=${VERSION:-5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,8 +80,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/int.patch - export PYTHON=python3 CFLAGS="$SLKCFLAGS" \ diff --git a/development/systemtap/systemtap.info b/development/systemtap/systemtap.info index e8be62cd34..3d8c1c4f2d 100644 --- a/development/systemtap/systemtap.info +++ b/development/systemtap/systemtap.info @@ -1,8 +1,8 @@ PRGNAM="systemtap" -VERSION="4.5" +VERSION="5.1" HOMEPAGE="https://sourceware.org/systemtap/" -DOWNLOAD="https://sourceware.org/systemtap/ftp/releases/systemtap-4.5.tar.gz" -MD5SUM="39369e2aa08636ea6600464e9fdc5185" +DOWNLOAD="https://sourceware.org/systemtap/ftp/releases/systemtap-5.1.tar.gz" +MD5SUM="d4f8d8f2ed09031a9a284e894c95103e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/tora/gcc14.patch b/development/tora/gcc14.patch new file mode 100644 index 0000000000..89057fae27 --- /dev/null +++ b/development/tora/gcc14.patch @@ -0,0 +1,52 @@ +--- a/extlibs/dtl/dtl/Diff.hpp 2020-04-04 05:42:48.000000000 -0500 ++++ b/extlibs/dtl/dtl/Diff.hpp 2025-04-01 22:48:48.029602018 -0500 +@@ -162,7 +162,7 @@ + return trivial; + } + +- void enableTrivial () const { ++ void enableTrivial () { + this->trivial = true; + } + +--- a/extlibs/libantlr3cpp-3.5.3/include/antlr3cyclicdfa.hpp 2020-04-04 05:42:48.000000000 -0500 ++++ b/extlibs/libantlr3cpp-3.5.3/include/antlr3cyclicdfa.hpp 2025-04-02 22:38:54.580011846 -0500 +@@ -52,18 +52,18 @@ + /// Decision number that a particular static structure + /// represents. + /// +- const ANTLR_INT32 m_decisionNumber; ++ ANTLR_INT32 m_decisionNumber; + + /// What this decision represents + /// + const ANTLR_UCHAR* m_description; +- const ANTLR_INT32* const m_eot; +- const ANTLR_INT32* const m_eof; +- const ANTLR_INT32* const m_min; +- const ANTLR_INT32* const m_max; +- const ANTLR_INT32* const m_accept; +- const ANTLR_INT32* const m_special; +- const ANTLR_INT32* const *const m_transition; ++ const ANTLR_INT32* m_eot; ++ const ANTLR_INT32* m_eof; ++ const ANTLR_INT32* m_min; ++ const ANTLR_INT32* m_max; ++ const ANTLR_INT32* m_accept; ++ const ANTLR_INT32* m_special; ++ const ANTLR_INT32** m_transition; + + public: + CyclicDFA( ANTLR_INT32 decisionNumber + +--- a/extlibs/libantlr3cpp-3.5.3/include/antlr3cyclicdfa.inl 2020-04-04 05:42:48.000000000 -0500 ++++ b/extlibs/libantlr3cpp-3.5.3/include/antlr3cyclicdfa.inl 2025-04-02 22:53:27.867669706 -0500 +@@ -17,7 +17,7 @@ + , m_max(max) + , m_accept(accept) + , m_special(special) +- , m_transition(transition) ++ , m_transition(const_cast(transition)) + { + m_description = description; + } diff --git a/development/tora/tora.SlackBuild b/development/tora/tora.SlackBuild index 5d60dc0946..2d9479a78b 100644 --- a/development/tora/tora.SlackBuild +++ b/development/tora/tora.SlackBuild @@ -81,6 +81,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/gcc14.patch + mkdir -p build cd build cmake \ @@ -90,6 +92,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DWANT_INTERNAL_QSCINTILLA=1 \ -DWANT_INTERNAL_LOKI=1 \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/development/unifdef/unifdef.SlackBuild b/development/unifdef/unifdef.SlackBuild index 7f6f7da067..e89125f574 100644 --- a/development/unifdef/unifdef.SlackBuild +++ b/development/unifdef/unifdef.SlackBuild @@ -57,7 +57,7 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -make CFLAGS="$SLKCFLAGS" DESTDIR=$PKG +make CFLAGS="$SLKCFLAGS -std=gnu17" DESTDIR=$PKG mkdir -p $PKG/usr/bin $PKG/usr/man/man1 diff --git a/development/unittest-cpp/unittest-cpp.SlackBuild b/development/unittest-cpp/unittest-cpp.SlackBuild index 061e9fea38..4ff4cc370d 100644 --- a/development/unittest-cpp/unittest-cpp.SlackBuild +++ b/development/unittest-cpp/unittest-cpp.SlackBuild @@ -84,9 +84,10 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=uninitialized" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/development/valgrind/README b/development/valgrind/README deleted file mode 100644 index 7e4eec3411..0000000000 --- a/development/valgrind/README +++ /dev/null @@ -1,19 +0,0 @@ -Valgrind is a framework for building dynamic analysis tools. There are -Valgrind tools that can automatically detect many memory management -and threading bugs, and profile your programs in detail. You can also -use Valgrind to build new tools. - -The Valgrind distribution currently includes six production-quality -tools: a memory error detector, two thread error detectors, a cache -and branch-prediction profiler, a call-graph generating cache and -branch-prediction profiler, and a heap profiler. It also includes -three experimental tools: a heap/stack/global array overrun detector, -a different kind of heap profiler, and a SimPoint basic block vector -generator. It runs on the following platforms: x86/Linux, AMD64/Linux, -PPC32/Linux, PPC64/Linux, ARM/Linux, x86/MacOSX and AMD64/MacOSX. - -Optional dependency: either mpich or openmpi. If one of these is -found, valgrind will include the MPI wrapper, which allows using -valgrind with software that uses the MPI message passing standard. -Note that only one of mpich or openmpi should be installed, as they -conflict with each other. diff --git a/development/valgrind/slack-desc b/development/valgrind/slack-desc deleted file mode 100644 index 5129787498..0000000000 --- a/development/valgrind/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -valgrind: valgrind (award-winning suite of tools for debugging) -valgrind: -valgrind: Valgrind is an award-winning suite of tools for debugging and -valgrind: profiling Linux programs. With the tools that come with Valgrind, -valgrind: you can automatically detect many memory management and threading -valgrind: bugs, avoiding hours of frustrating bug-hunting, making your -valgrind: programs more stable. You can also perform detailed profiling, -valgrind: to speed up and reduce memory use of your programs. -valgrind: -valgrind: -valgrind: diff --git a/development/valgrind/valgrind.SlackBuild b/development/valgrind/valgrind.SlackBuild deleted file mode 100644 index 30d42ef90b..0000000000 --- a/development/valgrind/valgrind.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# Slackware build script for valgrind -# Written by Kyle Guinn -# Updated by Peter Wang -# Maintained by 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=valgrind -VERSION=${VERSION:-3.25.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - # The valgrind build system already passes -fpic - # and forcing -fPIC results in a build failure. - SLKCFLAGS="-O2" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Do NOT strip the shared objects, as recommended by the developers. -find $PKG -print0 | xargs -0 file | grep -e "executable" | 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* FAQ.txt NEWS README* \ - $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/doc/valgrind/html $PKG/usr/doc/$PRGNAM-$VERSION -# The doc directory is the only thing in $PKG/usr/share, and the only things -# left in it now are pdf and a ps doc files. They are large, so we won't keep -# them around. If you still want them, uncomment the line below. -# mv $PKG/usr/share/doc/valgrind/*.{ps,pdf} $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/valgrind/valgrind.info b/development/valgrind/valgrind.info deleted file mode 100644 index 53c01637b0..0000000000 --- a/development/valgrind/valgrind.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="valgrind" -VERSION="3.25.1" -HOMEPAGE="http://www.valgrind.org/" -DOWNLOAD="http://sourceware.org/pub/valgrind/valgrind-3.25.1.tar.bz2" -MD5SUM="2b424c9a43aa9bf2840d4989b01ea6e7" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/development/vc-intrinsics/vc-intrinsics.SlackBuild b/development/vc-intrinsics/vc-intrinsics.SlackBuild index ef9d2f1a1c..cb18b02a02 100644 --- a/development/vc-intrinsics/vc-intrinsics.SlackBuild +++ b/development/vc-intrinsics/vc-intrinsics.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vc-intrinsics -VERSION=${VERSION:-0.7.1} +VERSION=${VERSION:-0.18.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/vc-intrinsics/vc-intrinsics.info b/development/vc-intrinsics/vc-intrinsics.info index 73886671ce..c872982f04 100644 --- a/development/vc-intrinsics/vc-intrinsics.info +++ b/development/vc-intrinsics/vc-intrinsics.info @@ -1,8 +1,8 @@ PRGNAM="vc-intrinsics" -VERSION="0.7.1" +VERSION="0.18.0" HOMEPAGE="https://github.com/intel/vc-intrinsics" -DOWNLOAD="https://github.com/intel/vc-intrinsics/archive/v0.7.1/vc-intrinsics-0.7.1.tar.gz" -MD5SUM="80cb159761b289b2c33495de139c6630" +DOWNLOAD="https://github.com/intel/vc-intrinsics/archive/v0.18.0/vc-intrinsics-0.18.0.tar.gz" +MD5SUM="f75ba44799c015deeb37064039fae0cf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/zig/zig.SlackBuild b/development/zig/zig.SlackBuild index 4d10db7b5d..b7358839ec 100644 --- a/development/zig/zig.SlackBuild +++ b/development/zig/zig.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=zig -VERSION=${VERSION:-0.9.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.15.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -53,19 +53,19 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" - SRCNAM=zig-linux-i386 + SRCNAM=zig-x86-linux elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" - SRCNAM=zig-linux-i386 + SRCNAM=zig-x86-linux elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" - SRCNAM=zig-linux-x86_64 + SRCNAM=zig-x86_64-linux else SLKCFLAGS="-O2" LIBDIRSUFFIX="" - SRCNAM=zig-linux-x86_64 + SRCNAM=zig-x86_64-linux fi set -e diff --git a/development/zig/zig.info b/development/zig/zig.info index 861e2db8d3..d04146648d 100644 --- a/development/zig/zig.info +++ b/development/zig/zig.info @@ -1,10 +1,10 @@ PRGNAM="zig" -VERSION="0.9.1" +VERSION="0.15.1" HOMEPAGE="https://ziglang.org/" -DOWNLOAD="https://ziglang.org/download/0.9.1/zig-linux-i386-0.9.1.tar.xz" -MD5SUM="20d6450b41ac07761717671ffa4c7922" -DOWNLOAD_x86_64="https://ziglang.org/download/0.9.1/zig-linux-x86_64-0.9.1.tar.xz" -MD5SUM_x86_64="01daf426d9e1c86aad6e4b26351e1ae8" +DOWNLOAD="https://ziglang.org/download/0.15.1/zig-x86-linux-0.15.1.tar.xz" +MD5SUM="7d47cedfd6d8f5e5f3146e02f4fd2790" +DOWNLOAD_x86_64="https://ziglang.org/download/0.15.1/zig-x86_64-linux-0.15.1.tar.xz" +MD5SUM_x86_64="8c36c83d2d956b819c9fa231cf019922" REQUIRES="" MAINTAINER="Damian Perticone" EMAIL="mjolnirdam@gmail.com" diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild index 889275cf3e..7475bb3458 100644 --- a/games/0ad/0ad.SlackBuild +++ b/games/0ad/0ad.SlackBuild @@ -82,6 +82,7 @@ find -L . \ unset CPPFLAGS +export CMAKE_POLICY_VERSION_MINIMUM=3.5 export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" export LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" diff --git a/games/armagetronad/armagetronad.SlackBuild b/games/armagetronad/armagetronad.SlackBuild index a0e82904e9..9e0a52342b 100644 --- a/games/armagetronad/armagetronad.SlackBuild +++ b/games/armagetronad/armagetronad.SlackBuild @@ -79,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +for i in $CWD/patches/* ; do patch -p1 < $i ; done + ./bootstrap.sh # Using --disable-games since it peppers installation @@ -106,6 +108,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-desktop \ --enable-initscripts=/etc/rc.d \ --disable-games \ + --enable-automakedefaults \ --enable-binreloc \ --enable-binreloc-threads diff --git a/games/armagetronad/patches/libxml2-2.14_1.patch b/games/armagetronad/patches/libxml2-2.14_1.patch new file mode 100644 index 0000000000..1091096e03 --- /dev/null +++ b/games/armagetronad/patches/libxml2-2.14_1.patch @@ -0,0 +1,304 @@ +From 70a65268beea7ace1f53c9676dccbc219f894277 Mon Sep 17 00:00:00 2001 +From: Manuel Moos +Date: Sat, 1 Mar 2025 21:10:01 +0100 +Subject: [PATCH] First draft of impelementing downloading using curl + +--- + src/network/nKrawall.h | 2 +- + src/network/nKrawallPrivate.cpp | 31 ++----- + src/tools/tResourceManager.cpp | 160 +++++++++++++++++++++++++------- + src/tools/tResourceManager.h | 12 +++ + 4 files changed, 149 insertions(+), 56 deletions(-) + +diff --git a/src/network/nKrawall.h b/src/network/nKrawall.h +index a73328ddd..363bee0c0 100644 +--- a/src/network/nKrawall.h ++++ b/src/network/nKrawall.h +@@ -262,7 +262,7 @@ public: + nPasswordCheckData const & data ); + + // fetches an URL content, return http return code (-1 if total failure), fill result stream. +- static int FetchURL( tString const & authority, char const * query, std::ostream & target, int maxlen = 10000 ); ++ static int FetchURL(tString const& authority, char const* query, std::ostream& target); + + #ifdef KRAWALL_SERVER_LEAGUE + // secret key to encrypt server->master server league transfer +diff --git a/src/network/nKrawallPrivate.cpp b/src/network/nKrawallPrivate.cpp +index bfaabeee8..a0d6a37e8 100644 +--- a/src/network/nKrawallPrivate.cpp ++++ b/src/network/nKrawallPrivate.cpp +@@ -37,6 +37,7 @@ the executable is not distributed). + #include "tConsole.h" + #include "nNetwork.h" + #include "tConfiguration.h" ++#include "tResourceManager.h" + #include "tArray.h" + + #include +@@ -447,7 +448,7 @@ void nKrawall::CheckScrambledPassword( nCheckResultBase & result, + } + } + +-int nKrawall::FetchURL( tString const & authority, char const * query, std::ostream & target, int maxlen ) ++int nKrawall::FetchURL(tString const& authority, char const* query, std::ostream& target) + { + // compose real URL + std::ostringstream fullURL; +@@ -458,31 +459,15 @@ int nKrawall::FetchURL( tString const & authority, char const * query, std::ostr + // con << "Fetching authentication URL " << fullURL.str() << "\n"; + + // fetch URL +- void * ctxt = xmlNanoHTTPOpen( fullURL.str().c_str(), NULL); +- if (ctxt == NULL) +- { +- return -1; +- } +- +- int rc = xmlNanoHTTPReturnCode(ctxt); ++ tResourceManager::Result ret = tResourceManager::FetchURI(fullURL.str().c_str(), target); + +- // read content +- char buf[1000]; +- buf[0] = 0; +- unsigned int len = 1; +- while ( len > 0 && maxlen > 0 ) ++ switch (ret) + { +- int max = sizeof(buf); +- if ( max > maxlen ) +- max = maxlen; +- len = xmlNanoHTTPRead( ctxt, &buf, max ); +- target.write( buf, len ); +- maxlen -= len; ++ case tResourceManager::Result::OK: ++ return 200; ++ default: ++ return -1; + } +- +- xmlNanoHTTPClose(ctxt); +- +- return rc; + } + + #ifdef KRAWALL_SERVER_LEAGUE +diff --git a/src/tools/tResourceManager.cpp b/src/tools/tResourceManager.cpp +index 60d9a92e4..6f689a0a5 100644 +--- a/src/tools/tResourceManager.cpp ++++ b/src/tools/tResourceManager.cpp +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -14,6 +15,50 @@ + #include "tResourceManager.h" + #include "tString.h" + ++#ifndef LIBXML_HTTP_ENABLED ++#ifdef LIBCURL_PROTOCOL_HTTP ++#include ++ ++class tCurlGlobal ++{ ++public: ++ tCurlGlobal() ++ { ++ curl_global_init(CURL_GLOBAL_DEFAULT); ++ }; ++ ++ ~tCurlGlobal() ++ { ++ curl_global_cleanup(); ++ } ++}; ++ ++class tCurlLocal ++{ ++private: ++ CURL* _handle; ++ ++public: ++ tCurlLocal() ++ { ++ static tCurlGlobal curlGlobal; ++ _handle = curl_easy_init(); ++ }; ++ ++ ~tCurlLocal() ++ { ++ curl_easy_cleanup(_handle); ++ } ++ ++ operator CURL*() ++ { ++ return _handle; ++ } ++}; ++ ++#endif ++#endif ++ + // server determined resource repository + tString tResourceManager::resRepoServer("http://resource.armagetronad.net/resource/"); + // the nSettingItem is in gStuff.cpp +@@ -22,47 +67,98 @@ tString tResourceManager::resRepoServer("http://resource.armagetronad.net/resour + tString tResourceManager::resRepoClient("http://resource.armagetronad.net/resource/"); + static tSettingItem conf_res_repo("RESOURCE_REPOSITORY_CLIENT", tResourceManager::resRepoClient); + +-static int myHTTPFetch(const char *URI, const char *filename, const char *savepath) ++tResourceManager::Result tResourceManager::FetchURI(const char* URI, std::ostream& o, int maxLen) + { +- void *ctxt = NULL; +- char *buf = NULL; +- FILE* fd; +- int len, rc; +- +- con << tOutput( "$resource_downloading", URI ); +- // con << "Downloading " << URI << "...\n"; ++#ifdef LIBXML_HTTP_ENABLED ++ { ++ void* ctxt = NULL; ++ int len, rc; ++ ++ ctxt = xmlNanoHTTPOpen(URI, NULL); ++ if (ctxt == NULL) ++ { ++ con << tOutput("$resource_fetcherror_noconnect", URI); ++ return ERROR_URI; ++ } + +- ctxt = xmlNanoHTTPOpen(URI, NULL); +- if (ctxt == NULL) { +- con << tOutput( "$resource_fetcherror_noconnect", URI ); +- return 1; +- } ++ if ((rc = xmlNanoHTTPReturnCode(ctxt)) != 200) ++ { ++ con << tOutput(rc == 404 ? "$resource_fetcherror_404" : "$resource_fetcherror", rc); ++ return rc == 404 ? ERROR_NOACCESS : ERROR_NOTFOUND; ++ } + +- if ( (rc = xmlNanoHTTPReturnCode(ctxt)) != 200 ) { +- con << tOutput( rc == 404 ? "$resource_fetcherror_404" : "$resource_fetcherror", rc ); +- return 2; +- } ++ // xmlNanoHTTPFetchContent( ctxt, &buf, &len ); ++ char buf[10000]; ++ while ((len = xmlNanoHTTPRead(ctxt, buf, sizeof(buf))) > 0) ++ { ++ if (maxLen >= 0) ++ { ++ if (maxLen == 0) ++ break; ++ len = std::min(len, maxLen); ++ maxLen -= len; ++ } ++ o.write(buf, len); ++ } + +- fd = fopen(savepath, "w"); +- if (fd == NULL) { + xmlNanoHTTPClose(ctxt); +- con << tOutput( "$resource_no_write", savepath ); +- return 3; + } +- +- //xmlNanoHTTPFetchContent( ctxt, &buf, &len ); +- int maxlen = 10000; +- buf = (char*)malloc(maxlen); +- while( (len = xmlNanoHTTPRead(ctxt, buf, maxlen)) > 0 ) { +- Ignore( fwrite(buf, len, 1, fd) ); ++#else ++#ifdef LIBCURL_PROTOCOL_HTTP ++ { ++ tCurlLocal handle; ++ ++ // Set the URL to request ++ curl_easy_setopt(handle, CURLOPT_URL, "https://www.example.com"); ++ // Set the callback function to handle the response ++ curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, [](char* data, size_t size, size_t nmemb, void* userp) { ++ // Cast the user pointer to an ostream and write the data to it ++ static_cast(userp)->write(data, size); ++ // Return the number of bytes processed ++ return size * nmemb; ++ }); ++ // Set the user pointer to be an ostream to which the response will be written ++ std::ostringstream response; ++ curl_easy_setopt(handle, CURLOPT_WRITEDATA, &response); ++ // Perform the request ++ CURLcode result = curl_easy_perform(handle); ++ // Check the result ++ if (result != CURLE_OK) ++ { ++ // If the request failed, print an error message ++ std::cerr << "curl_easy_perform() failed: " << curl_easy_strerror(result) << std::endl; ++ } ++ else ++ { ++ // If the request was successful, print the response ++ std::cout << response.str() << std::endl; ++ } ++ // Clean up ++ curl_easy_cleanup(handle); + } +- free(buf); +- +- xmlNanoHTTPClose(ctxt); +- fclose(fd); ++#else ++ con << "FAILED libcurl or libxml's nanohttp required"; ++ return ERROR_UNKNOWN; ++#endif ++#endif ++ con << "OK\n"; ++ return Result::OK; ++} + ++static int myHTTPFetch(const char* URI, const char* filename, const char* savepath) ++{ ++ con << tOutput("$resource_downloading", URI); ++ // con << "Downloading " << URI << "...\n"; + +- con << "OK\n"; ++ try ++ { ++ std::ofstream o{savepath}; ++ return tResourceManager::FetchURI(URI, o); ++ } ++ catch (...) ++ { ++ return 4; ++ } + + return 0; + } +diff --git a/src/tools/tResourceManager.h b/src/tools/tResourceManager.h +index 192c37581..0421bff60 100644 +--- a/src/tools/tResourceManager.h ++++ b/src/tools/tResourceManager.h +@@ -6,6 +6,18 @@ + //! resource manager: fetches and caches resources from repositories or arbitrary URIs + class tResourceManager { + public: ++ enum Result ++ { ++ OK = 0, ++ ERROR_UNKNOWN = 1, ++ ERROR_URI = 2, // URI not well formed ++ ERROR_NOTFOUND = 3, // URI not found ++ ERROR_NOACCESS = 4 // Access denied ++ }; ++ ++ // fetches an URI and stores it in the provided stream, up to maxLen bytes ++ static Result FetchURI(const char* URI, std::ostream& o, int maxLen = -1); ++ + //! Return the position of the resource in the cache + static tString locateResource(const char *uri, const char *file); + //! opens a resource +-- +GitLab + diff --git a/games/armagetronad/patches/libxml2-2.14_2.patch b/games/armagetronad/patches/libxml2-2.14_2.patch new file mode 100644 index 0000000000..48318cc7e7 --- /dev/null +++ b/games/armagetronad/patches/libxml2-2.14_2.patch @@ -0,0 +1,68 @@ +From ab0d22fe74dc90c13ea4c94c48fdb0d1a9730b94 Mon Sep 17 00:00:00 2001 +From: Manuel Moos +Date: Sun, 2 Mar 2025 00:04:32 +0100 +Subject: [PATCH] Adapt to future changed return code of nKrawall::FetchURL + +More fully map actual URI fetching return codes to FetchURL return codes +--- + src/network/nAuthentication.cpp | 4 ++-- + src/network/nKrawallPrivate.cpp | 13 ++++--------- + 2 files changed, 6 insertions(+), 11 deletions(-) + +diff --git a/src/network/nAuthentication.cpp b/src/network/nAuthentication.cpp +index 0e3625c24..16b0028aa 100644 +--- a/src/network/nAuthentication.cpp ++++ b/src/network/nAuthentication.cpp +@@ -788,7 +788,7 @@ bool nLoginProcess::FetchInfoFromAuthorityRemote() + std::stringstream answer; + int rc = nKrawall::FetchURL( fullAuthority, "?query=methods", answer ); + +- if ( rc == -1 ) ++ if (rc < 0) + { + return ReportAuthorityError( tOutput( "$login_error_invalidurl_notfound", authority ) ); + } +@@ -835,7 +835,7 @@ bool nLoginProcess::FetchInfoFromAuthorityRemote() + + if ( rc != 200 ) + { +- if ( rc == -1 ) ++ if (rc < 0) + { + return ReportAuthorityError( tOutput( "$login_error_invalidurl_notfound", authority ) ); + } +diff --git a/src/network/nKrawallPrivate.cpp b/src/network/nKrawallPrivate.cpp +index a0d6a37e8..fd717d801 100644 +--- a/src/network/nKrawallPrivate.cpp ++++ b/src/network/nKrawallPrivate.cpp +@@ -334,7 +334,7 @@ void nKrawall::CheckScrambledPassword( nCheckResultBase & result, + std::stringstream content; + int rc = FetchURL( data.fullAuthority, request.str().c_str(), content ); + +- if (rc == -1) ++ if (rc < 0) + { + result.error = tOutput( "$login_error_invalidurl_notfound", result.authority ); + result.success = false; +@@ -459,15 +459,10 @@ int nKrawall::FetchURL(tString const& authority, char const* query, std::ostream + // con << "Fetching authentication URL " << fullURL.str() << "\n"; + + // fetch URL +- tResourceManager::Result ret = tResourceManager::FetchURI(fullURL.str().c_str(), target); +- +- switch (ret) +- { +- case tResourceManager::Result::OK: +- return 200; +- default: ++ int ret = tResourceManager::FetchURI(fullURL.str().c_str(), target); ++ if (ret < 0) + return -1; +- } ++ return ret; + } + + #ifdef KRAWALL_SERVER_LEAGUE +-- +GitLab + diff --git a/games/astromenace/astromenace.SlackBuild b/games/astromenace/astromenace.SlackBuild index 111003453d..e1efecf581 100644 --- a/games/astromenace/astromenace.SlackBuild +++ b/games/astromenace/astromenace.SlackBuild @@ -79,6 +79,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/\#include\ \/\#include\ \\\n\#include\ \/ ./src/core/model3d/model3d.cpp + cmake ./ # create Makefile make # build game diff --git a/games/d1x-rebirth/d1x-rebirth.SlackBuild b/games/d1x-rebirth/d1x-rebirth.SlackBuild index f9b3e8f86c..f917151022 100644 --- a/games/d1x-rebirth/d1x-rebirth.SlackBuild +++ b/games/d1x-rebirth/d1x-rebirth.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d1x-rebirth SRCNAM=dxx-rebirth -VERSION=${VERSION:-20220130_7258b7f} +VERSION=${VERSION:-20230520_695e8b9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/d1x-rebirth/d1x-rebirth.info b/games/d1x-rebirth/d1x-rebirth.info index f20bb59a15..488e219d16 100644 --- a/games/d1x-rebirth/d1x-rebirth.info +++ b/games/d1x-rebirth/d1x-rebirth.info @@ -1,8 +1,8 @@ PRGNAM="d1x-rebirth" -VERSION="20220130_7258b7f" +VERSION="20230520_695e8b9" HOMEPAGE="https://www.dxx-rebirth.com/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz" -MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20230520_695e8b9.tar.xz" +MD5SUM="20daa2377b7cd13ada79b12da2b762d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs" diff --git a/games/d2x-rebirth/d2x-rebirth.SlackBuild b/games/d2x-rebirth/d2x-rebirth.SlackBuild index 0cafd4fd74..1145e2fe58 100644 --- a/games/d2x-rebirth/d2x-rebirth.SlackBuild +++ b/games/d2x-rebirth/d2x-rebirth.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d2x-rebirth SRCNAM=dxx-rebirth -VERSION=${VERSION:-20220130_7258b7f} +VERSION=${VERSION:-20230520_695e8b9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/d2x-rebirth/d2x-rebirth.info b/games/d2x-rebirth/d2x-rebirth.info index 4c1f7a9b2e..a35c67c150 100644 --- a/games/d2x-rebirth/d2x-rebirth.info +++ b/games/d2x-rebirth/d2x-rebirth.info @@ -1,8 +1,8 @@ PRGNAM="d2x-rebirth" -VERSION="20220130_7258b7f" +VERSION="20230520_695e8b9" HOMEPAGE="https://www.dxx-rebirth.com/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz" -MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20230520_695e8b9.tar.xz" +MD5SUM="20daa2377b7cd13ada79b12da2b762d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs" diff --git a/games/doomsday/doomsday.SlackBuild b/games/doomsday/doomsday.SlackBuild index 87ce49015a..8651fd9a2b 100644 --- a/games/doomsday/doomsday.SlackBuild +++ b/games/doomsday/doomsday.SlackBuild @@ -49,11 +49,13 @@ # that, do all of the above, then hand off maintenance to someone # who can afford a shinier newer video card than I can. +# 20250614 KEC: gcc-15 compatibility + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=doomsday VERSION=${VERSION:-2.3.1} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -105,9 +107,10 @@ mkdir -p build-amethyst cd build-amethyst cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-template-body" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ ../doomsday/tools/amethyst make make install/strip DESTDIR=$PKG @@ -117,8 +120,9 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-template-body" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/games/frozen-bubble/frozen-bubble.SlackBuild b/games/frozen-bubble/frozen-bubble.SlackBuild index c5395e6305..d40bebbc93 100644 --- a/games/frozen-bubble/frozen-bubble.SlackBuild +++ b/games/frozen-bubble/frozen-bubble.SlackBuild @@ -82,6 +82,7 @@ find -L . \ # Werror breaks build on current sed -i "s|\ -Werror||" inc/My/Builder.pm +sed -i "s|\ '0\.36'\ =>||" inc/My/Builder.pm perl Build.PL \ prefix=/usr \ diff --git a/games/gnugo/README b/games/gnugo/README deleted file mode 100644 index ea21969705..0000000000 --- a/games/gnugo/README +++ /dev/null @@ -1,7 +0,0 @@ -GNU Go is a free program that plays the game of Go. -GNU Go has played thousands of games on the NNGS Go server. GNU Go is -now also playing regularly on the Legend Go Server in Taiwan, on the -WING server in Japan, and many volunteers run GNU Go clients on KGS. -GNU Go has established itself as the leading non-commercial go program -in the recent tournaments that it has taken part in. - diff --git a/games/gnugo/gnugo.SlackBuild b/games/gnugo/gnugo.SlackBuild deleted file mode 100644 index 42bbef4a0a..0000000000 --- a/games/gnugo/gnugo.SlackBuild +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# Slackware build script for gnugo - -# Copyright 2013 by Guillermo Bonvehi (gbonvehi@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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=gnugo -VERSION=${VERSION:-3.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 -xzvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS -fcommon" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --bindir=/usr/games \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION - -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 - -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/*.info* - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING INSTALL NEWS README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/games/gnugo/gnugo.info b/games/gnugo/gnugo.info deleted file mode 100644 index 6c9c99f41c..0000000000 --- a/games/gnugo/gnugo.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gnugo" -VERSION="3.8" -HOMEPAGE="http://www.gnu.org/software/gnugo/gnugo.html" -DOWNLOAD="http://ftp.gnu.org/gnu/gnugo/gnugo-3.8.tar.gz" -MD5SUM="6db0a528df58876d2b0ef1659c374a9a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Guillermo Bonvehi" -EMAIL="gbonvehi@gmail.com" diff --git a/games/gnugo/slack-desc b/games/gnugo/slack-desc deleted file mode 100644 index 98686bca3e..0000000000 --- a/games/gnugo/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gnugo: gnugo (free version of the game of Go) -gnugo: -gnugo: GNU Go has played thousands of games on the NNGS Go server. GNU Go is -gnugo: now also playing regularly on the Legend Go Server in Taiwan, on the -gnugo: WING server in Japan, and many volunteers run GNU Go clients on KGS. -gnugo: GNU Go has established itself as the leading non-commercial go program -gnugo: in the recent tournaments that it has taken part in. -gnugo: -gnugo: -gnugo: http://www.gnu.org/software/gnugo/gnugo.html -gnugo: diff --git a/games/hedgewars/cmake4.patch b/games/hedgewars/cmake4.patch new file mode 100644 index 0000000000..f6c0c86bee --- /dev/null +++ b/games/hedgewars/cmake4.patch @@ -0,0 +1,28 @@ +diff -Naur hedgewars-src-1.0.2.orig/CMakeLists.txt hedgewars-src-1.0.2/CMakeLists.txt +--- hedgewars-src-1.0.2.orig/CMakeLists.txt 2022-09-13 00:33:59.000000000 +0200 ++++ hedgewars-src-1.0.2/CMakeLists.txt 2025-07-23 14:32:06.333368259 +0200 +@@ -11,7 +11,7 @@ + + foreach(hwpolicy CMP0026 CMP0068) + if(POLICY ${hwpolicy}) +- cmake_policy(SET ${hwpolicy} OLD) ++ cmake_policy(SET ${hwpolicy} NEW) + endif() + endforeach() + +diff -Naur hedgewars-src-1.0.2.orig/misc/libphyslayer/CMakeLists.txt hedgewars-src-1.0.2/misc/libphyslayer/CMakeLists.txt +--- hedgewars-src-1.0.2.orig/misc/libphyslayer/CMakeLists.txt 2022-09-12 16:27:31.000000000 +0200 ++++ hedgewars-src-1.0.2/misc/libphyslayer/CMakeLists.txt 2025-07-23 14:34:08.847368259 +0200 +@@ -21,12 +21,10 @@ + install(TARGETS physlayer RUNTIME DESTINATION ${target_binary_install_dir} + LIBRARY DESTINATION ${target_library_install_dir} + ARCHIVE DESTINATION ${target_library_install_dir}) +-get_target_property(physlayer_fullpath physlayer LOCATION) + + + ## added standard variables (FORCE or cmake won't pick 'em) + set(PHYSLAYER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "Physlayer include dir" FORCE) +-set(PHYSLAYER_LIBRARY ${physlayer_fullpath} CACHE STRING "Physlayer library" FORCE) + + if(BUILD_ENGINE_JS) + set_target_properties(physlayer PROPERTIES SUFFIX ".bc") diff --git a/games/hedgewars/hedgewars.SlackBuild b/games/hedgewars/hedgewars.SlackBuild index b70ce2ade8..d3b9705a84 100644 --- a/games/hedgewars/hedgewars.SlackBuild +++ b/games/hedgewars/hedgewars.SlackBuild @@ -91,6 +91,8 @@ chown -R root:root . find . -type f -a -exec chmod 644 {} + \ -o -type d -a -exec chmod 755 {} + +patch -p1 < $CWD/cmake4.patch + SLKCFLAGS+=" -fcommon" mkdir -p build @@ -102,7 +104,8 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DNOVIDEOREC=ON \ -DNOSERVER=ON \ - -DLUA_SYSTEM=OFF \ + -DLUA_SYSTEM=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install/strip DESTDIR=$PKG diff --git a/games/hedgewars/hedgewars.info b/games/hedgewars/hedgewars.info index c503f1abcf..3d8f9fb368 100644 --- a/games/hedgewars/hedgewars.info +++ b/games/hedgewars/hedgewars.info @@ -5,6 +5,6 @@ DOWNLOAD="https://www.hedgewars.org/download/releases/hedgewars-src-1.0.2.tar.bz MD5SUM="1a91a973201c91bba2a494d428cadfbf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="fpc physfs" +REQUIRES="fpc lua51 physfs" MAINTAINER="B. Watson" EMAIL="urchlay@slackware.uk" diff --git a/games/higan/higan.SlackBuild b/games/higan/higan.SlackBuild index 39d9901f01..31cd37b92a 100644 --- a/games/higan/higan.SlackBuild +++ b/games/higan/higan.SlackBuild @@ -116,6 +116,8 @@ chown -R root:root . # for its support files if they're not found in ~/.local/share/higan. patch -p1 -i $CWD/higan-flags.diff patch -p1 -i $CWD/higan-paths.diff +# 20240131 KEC: gcc-13.x compatibility +patch -p1 -i $CWD/includes.diff # 20181212 bkw: audio system stuff. Upstream doesn't give us a way to # disable these on the make command line, but hacking this file works: diff --git a/games/higan/includes.diff b/games/higan/includes.diff new file mode 100644 index 0000000000..09b1a5bc2b --- /dev/null +++ b/games/higan/includes.diff @@ -0,0 +1,8 @@ +--- higan-106.orig/nall/arithmetic/natural.hpp 2024-01-31 09:12:37.166634947 +0900 ++++ higan-106/nall/arithmetic/natural.hpp 2024-01-31 09:12:58.147526383 +0900 +@@ -1,3 +1,5 @@ ++#include ++ + #define ConcatenateType(Size) uint##Size##_t + #define DeclareType(Size) ConcatenateType(Size) + diff --git a/games/innoextract/boost.diff b/games/innoextract/boost.diff new file mode 100644 index 0000000000..ebfd1d05d9 --- /dev/null +++ b/games/innoextract/boost.diff @@ -0,0 +1,10 @@ +--- src/stream/slice.cpp.old 2025-01-13 01:33:11.931938806 +0900 ++++ src/stream/slice.cpp 2025-01-13 01:33:37.380340774 +0900 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + + #include "util/console.hpp" diff --git a/games/innoextract/innoextract.SlackBuild b/games/innoextract/innoextract.SlackBuild index 6c57defcf6..dee4042436 100644 --- a/games/innoextract/innoextract.SlackBuild +++ b/games/innoextract/innoextract.SlackBuild @@ -80,6 +80,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# KEC: boost compatibility patch (2025-01-13) (Upstream 264c2fe) +patch -p0 < $CWD/boost.diff + mkdir -p build cd build cmake \ diff --git a/games/maelstrom/maelstrom.SlackBuild b/games/maelstrom/maelstrom.SlackBuild index 88cddc94c8..2a0fc29553 100644 --- a/games/maelstrom/maelstrom.SlackBuild +++ b/games/maelstrom/maelstrom.SlackBuild @@ -80,7 +80,7 @@ sed -i '/GAME_INSTALLDIR=.*games/s,/games,/share/games,' configure # on -current (and it does no harm on 14.2 either): sed -i 's,struct *button,struct b_utton,g' buttonlist.h -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/games/micropolis/micropolis.SlackBuild b/games/micropolis/micropolis.SlackBuild index bd09100122..44e4416579 100644 --- a/games/micropolis/micropolis.SlackBuild +++ b/games/micropolis/micropolis.SlackBuild @@ -93,7 +93,7 @@ run_make() { DOCDIR=$DOCDIR \ DATADIR=/usr/share/games/$PRGNAM \ BINDIR=/usr/games \ - SLKCFLAGS="$SLKCFLAGS -DTCL_IEEE_FP_MATH" \ + SLKCFLAGS="$SLKCFLAGS -DTCL_IEEE_FP_MATH -fpermissive -std=gnu17" \ DESTDIR=$PKG \ "$@" } diff --git a/games/openttd/icu.patch b/games/openttd/icu.patch new file mode 100644 index 0000000000..bf30f2c0e7 --- /dev/null +++ b/games/openttd/icu.patch @@ -0,0 +1,33 @@ +https://github.com/OpenTTD/OpenTTD/commit/14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e + +From 14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e Mon Sep 17 00:00:00 2001 +From: fundawang +Date: Tue, 5 Nov 2024 19:12:34 +0800 +Subject: [PATCH] Fix: build with icu >= 76 where icu-i18n and icu-uc become + separated (#13048) + +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 137eb7d0f8ce9..2f0248047506a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,7 +152,7 @@ if(NOT OPTION_DEDICATED) + find_package(Fontconfig) + endif() + find_package(Harfbuzz) +- find_package(ICU OPTIONAL_COMPONENTS i18n) ++ find_package(ICU OPTIONAL_COMPONENTS i18n uc) + endif() + endif() + endif() +@@ -331,6 +331,7 @@ if(NOT OPTION_DEDICATED) + link_package(Fontconfig TARGET Fontconfig::Fontconfig) + link_package(Harfbuzz TARGET harfbuzz::harfbuzz) + link_package(ICU_i18n) ++ link_package(ICU_uc) + + if(SDL2_FOUND AND OPENGL_FOUND AND UNIX) + # SDL2 dynamically loads OpenGL if needed, so do not link to OpenGL when diff --git a/games/openttd/openttd.SlackBuild b/games/openttd/openttd.SlackBuild index e6b364f06e..9a3d1460ae 100644 --- a/games/openttd/openttd.SlackBuild +++ b/games/openttd/openttd.SlackBuild @@ -96,6 +96,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 {} \; +# KEC: icu-76.1 compatibility (2025-01-13) (upstream 14fac2a) (via Gentoo) +patch -p1 < $CWD/icu.patch + mkdir -p build cd build cmake \ diff --git a/games/paranoia/gcc-14.diff b/games/paranoia/gcc-14.diff new file mode 100644 index 0000000000..4cc2a72644 --- /dev/null +++ b/games/paranoia/gcc-14.diff @@ -0,0 +1,201 @@ +--- paranoia.c.old 2024-12-08 20:23:44.227674984 +0900 ++++ paranoia.c 2024-12-08 20:27:09.336066414 +0900 +@@ -24,0 +25,3 @@ ++void character(); ++void instructions(); ++ +@@ -33 +36 @@ +-more() ++void more() +@@ -47 +50 @@ +-new_clone(resume) ++int new_clone(resume) +@@ -67 +70 @@ +-dice_roll(number,faces) ++int dice_roll(number,faces) +@@ -75 +78 @@ +-instructions() ++void instructions() +@@ -96 +99 @@ +-character() ++void character() +@@ -122 +125 @@ +-choose(a,aptr,b,bptr) ++int choose(a,aptr,b,bptr) +@@ -132 +135 @@ +-page1() ++int page1() +@@ -140 +143 @@ +-page2() ++int page2() +@@ -158 +161 @@ +-page3() ++int page3() +@@ -166 +169 @@ +-page4() ++int page4() +@@ -174 +177 @@ +-page5() ++int page5() +@@ -185 +188 @@ +-page6() ++int page6() +@@ -197 +200 @@ +-page7() ++int page7() +@@ -224 +227 @@ +-page8() ++int page8() +@@ -241 +244 @@ +-page9() ++int page9() +@@ -254 +257 @@ +-page10() ++int page10() +@@ -282 +285 @@ +-page11() ++int page11() +@@ -313 +316 @@ +-page12() ++int page12() +@@ -325 +328 @@ +-page13() ++int page13() +@@ -338 +341 @@ +-page14() ++int page14() +@@ -352 +355 @@ +-page15() ++int page15() +@@ -376 +379 @@ +-page16() ++int page16() +@@ -387 +390 @@ +-page17() ++int page17() +@@ -424 +427 @@ +-page18() ++int page18() +@@ -440 +443 @@ +-page19() ++int page19() +@@ -453 +456 @@ +-page20() ++int page20() +@@ -465 +468 @@ +-page21() ++int page21() +@@ -474 +477 @@ +-page22() ++int page22() +@@ -486 +489 @@ +-page23() ++int page23() +@@ -495 +498 @@ +-page24() ++int page24() +@@ -503 +506 @@ +-page25() ++int page25() +@@ -511 +514 @@ +-page26() ++int page26() +@@ -521 +524 @@ +-page27() ++int page27() +@@ -527 +530 @@ +-page28() ++int page28() +@@ -533 +536 @@ +-page29() ++int page29() +@@ -551 +554 @@ +-page30() ++int page30() +@@ -578 +581 @@ +-page31() ++int page31() +@@ -591 +594 @@ +-page32() ++int page32() +@@ -601 +604 @@ +-page33() ++int page33() +@@ -614 +617 @@ +-page34() ++int page34() +@@ -642 +645 @@ +-page35() ++int page35() +@@ -661 +664 @@ +-page36() ++int page36() +@@ -684 +687 @@ +-page37() ++int page37() +@@ -700 +703 @@ +-page38() ++int page38() +@@ -717 +720 @@ +-page39() ++int page39() +@@ -735 +738 @@ +-page40() ++int page40() +@@ -767 +770 @@ +-page41() ++int page41() +@@ -781 +784 @@ +-page42() ++int page42() +@@ -791 +794 @@ +-page43() ++int page43() +@@ -807 +810 @@ +-page44() ++int page44() +@@ -825 +828 @@ +-page45() ++int page45() +@@ -839 +842 @@ +-page46() ++int page46() +@@ -847 +850 @@ +-page47() ++int page47() +@@ -859 +862 @@ +-page48() ++int page48() +@@ -869 +872 @@ +-page49() ++int page49() +@@ -876 +879 @@ +-page50() ++int page50() +@@ -885 +888 @@ +-page51() ++int page51() +@@ -892 +895 @@ +-page52() ++int page52() +@@ -899 +902 @@ +-page53() ++int page53() +@@ -905 +908 @@ +-page54() ++int page54() +@@ -919 +922 @@ +-page55() ++int page55() +@@ -947 +950 @@ +-page56() ++int page56() +@@ -955 +958 @@ +-page57() ++int page57() +@@ -962 +965 @@ +-next_page(this_page) ++int next_page(this_page) +@@ -1030 +1033 @@ +-main() ++void main() diff --git a/games/paranoia/paranoia.SlackBuild b/games/paranoia/paranoia.SlackBuild index 1fb6f07166..6f15b8055d 100644 --- a/games/paranoia/paranoia.SlackBuild +++ b/games/paranoia/paranoia.SlackBuild @@ -55,6 +55,9 @@ tar xvf $CWD/$SRCNAME-$VERSION.tar.gz --strip-components=2 games/paranoia chown -R root:root . chmod 644 * +# KEC: GCC 14 compatibility (2024-12-08) +patch -p0 < $CWD/gcc-14.diff + # Don't bother with the Makefile, this is a single source file, # and it'd be more work to beat the Makefile into shape than to just # compile with our options. diff --git a/games/pioneer/pioneer.SlackBuild b/games/pioneer/pioneer.SlackBuild index 2dcf5a8a46..66bfe5834f 100644 --- a/games/pioneer/pioneer.SlackBuild +++ b/games/pioneer/pioneer.SlackBuild @@ -106,6 +106,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_BINDIR=games \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_INSTALL_DATADIR=share/games \ -DUSE_SYSTEM_LIBGLEW=ON \ -DUSE_SYSTEM_LIBLUA=OFF \ diff --git a/games/pokerth/patches/boost_1.89.patch b/games/pokerth/patches/boost_1.89.patch new file mode 100644 index 0000000000..7bdfc53040 --- /dev/null +++ b/games/pokerth/patches/boost_1.89.patch @@ -0,0 +1,35 @@ +From d65e4e629694ced190e58b8be904fd6dc31bc392 Mon Sep 17 00:00:00 2001 +From: Hains van den Bosch +Date: Sun, 24 Aug 2025 09:49:30 +0200 +Subject: [PATCH] Fix build against Boost 1.89, thx @grover92000 + +--- + .../websocketpp/websocketpp/impl/connection_impl.hpp | 2 ++ + .../websocketpp/websocketpp/transport/asio/connection.hpp | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/src/third_party/websocketpp/websocketpp/impl/connection_impl.hpp b/src/third_party/websocketpp/websocketpp/impl/connection_impl.hpp +index c33be139e..9ba4ded68 100644 +--- a/src/third_party/websocketpp/websocketpp/impl/connection_impl.hpp ++++ b/src/third_party/websocketpp/websocketpp/impl/connection_impl.hpp +@@ -45,6 +45,8 @@ + #include + #include + ++#include ++ + namespace websocketpp { + + namespace istate = session::internal_state; +diff --git a/src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp b/src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp +index 6ba59d1a2..211857031 100644 +--- a/src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp ++++ b/src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp +@@ -44,6 +44,7 @@ + #include + + #include ++#include + #include + + #include diff --git a/games/pokerth/patches/boost_1.89_2.patch b/games/pokerth/patches/boost_1.89_2.patch new file mode 100644 index 0000000000..28146c3342 --- /dev/null +++ b/games/pokerth/patches/boost_1.89_2.patch @@ -0,0 +1,171 @@ +diff -Naur pokerth-20250404_1a8a157.orig/connectivity.pro pokerth-20250404_1a8a157/connectivity.pro +--- pokerth-20250404_1a8a157.orig/connectivity.pro 2025-04-04 06:18:26.000000000 +0200 ++++ pokerth-20250404_1a8a157/connectivity.pro 2025-09-02 21:41:31.699345000 +0200 +@@ -43,7 +43,6 @@ + INCLUDEPATH += $${PREFIX}/include + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) + BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt +- BOOST_SYS = boost_system boost_system-mt + + + # +@@ -61,18 +60,10 @@ + message("Found $$lib") + BOOST_PROGRAM_OPTIONS = -l$$lib + } +- for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) { +- message("Found $$lib") +- BOOST_SYS = -l$$lib +- } +- for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.a) { +- message("Found $$lib") +- BOOST_SYS = -l$$lib +- } + } + } +- BOOST_LIBS = $$BOOST_PROGRAM_OPTIONS $$BOOST_SYS +- !count(BOOST_LIBS, 2){ ++ BOOST_LIBS = $$BOOST_PROGRAM_OPTIONS ++ !count(BOOST_LIBS, 1){ + error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } + +diff -Naur pokerth-20250404_1a8a157.orig/load.pro pokerth-20250404_1a8a157/load.pro +--- pokerth-20250404_1a8a157.orig/load.pro 2025-04-04 06:18:26.000000000 +0200 ++++ pokerth-20250404_1a8a157/load.pro 2025-09-02 21:41:31.699345000 +0200 +@@ -45,7 +45,6 @@ + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) + BOOST_THREAD = boost_thread boost_thread-mt + BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt +- BOOST_SYS = boost_system boost_system-mt + + + # +@@ -71,18 +70,10 @@ + message("Found $$lib") + BOOST_PROGRAM_OPTIONS = -l$$lib + } +- for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) { +- message("Found $$lib") +- BOOST_SYS = -l$$lib +- } +- for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.a) { +- message("Found $$lib") +- BOOST_SYS = -l$$lib +- } + } + } +- BOOST_LIBS = $$BOOST_PROGRAM_OPTIONS $$BOOST_SYS $$BOOST_THREAD +- !count(BOOST_LIBS, 3){ ++ BOOST_LIBS = $$BOOST_PROGRAM_OPTIONS $$BOOST_THREAD ++ !count(BOOST_LIBS, 2){ + error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } + +diff -Naur pokerth-20250404_1a8a157.orig/pokerth_game.pro pokerth-20250404_1a8a157/pokerth_game.pro +--- pokerth-20250404_1a8a157.orig/pokerth_game.pro 2025-04-04 06:18:26.000000000 +0200 ++++ pokerth-20250404_1a8a157/pokerth_game.pro 2025-09-02 21:42:35.863345000 +0200 +@@ -426,8 +426,6 @@ + boost_iostreams-mt + BOOST_REGEX = boost_regex \ + boost_regex-mt +- BOOST_SYS = boost_system \ +- boost_system-mt + BOOST_RANDOM = boost_random \ + boost_random-mt + BOOST_CHRONO = boost_chrono \ +@@ -479,14 +477,6 @@ + BOOST_RANDOM = -l$$lib + } + } +- for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) { +- message("Found $$lib") +- BOOST_SYS = -l$$lib +- } +- for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.a) { +- message("Found $$lib") +- BOOST_SYS = -l$$lib +- } + !c++11 { + for(lib, BOOST_CHRONO):exists($${dir}/lib$${lib}.so*) { + message("Found $$lib") +@@ -504,9 +494,8 @@ + $$BOOST_FS \ + $$BOOST_IOSTREAMS \ + $$BOOST_REGEX \ +- $$BOOST_RANDOM \ +- $$BOOST_SYS +- !count(BOOST_LIBS, 6):error("Unable to find boost libraries in PREFIX=$${PREFIX}") ++ $$BOOST_RANDOM ++ !count(BOOST_LIBS, 5):error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } + !c++11 { + BOOST_LIBS = $$BOOST_THREAD \ +@@ -514,9 +503,8 @@ + $$BOOST_IOSTREAMS \ + $$BOOST_REGEX \ + $$BOOST_RANDOM \ +- $$$$BOOST_SYS \ + $$BOOST_CHRONO +- !count(BOOST_LIBS, 7):error("Unable to find boost libraries in PREFIX=$${PREFIX}") ++ !count(BOOST_LIBS, 6):error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } + if($$system(sdl-config --version)):error("sdl-config not found in PATH - libSDL_mixer, libSDL are required!") + UNAME = $$system(uname -s) +@@ -536,9 +524,8 @@ + BOOST_LIBS = $$BOOST_THREAD \ + $$BOOST_FS \ + $$BOOST_IOSTREAMS \ +- $$BOOST_REGEX \ +- $$BOOST_SYS +- !count(BOOST_LIBS, 5):error("Unable to find boost libraries in PREFIX=$${PREFIX}/armv5") ++ $$BOOST_REGEX ++ !count(BOOST_LIBS, 4):error("Unable to find boost libraries in PREFIX=$${PREFIX}/armv5") + LIBS += -ltinyxml + LIBS += $$BOOST_LIBS + LIBS += -lgsasl -lidn +diff -Naur pokerth-20250404_1a8a157.orig/pokerth_server.pro pokerth-20250404_1a8a157/pokerth_server.pro +--- pokerth-20250404_1a8a157.orig/pokerth_server.pro 2025-04-04 06:18:26.000000000 +0200 ++++ pokerth-20250404_1a8a157/pokerth_server.pro 2025-09-02 21:41:31.700345000 +0200 +@@ -185,7 +185,6 @@ + BOOST_THREAD = boost_thread boost_thread-mt + BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt + BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt +- BOOST_SYS = boost_system boost_system-mt + BOOST_REGEX = boost_regex boost_regex-mt + BOOST_RANDOM = boost_random boost_random-mt + BOOST_CHRONO = boost_chrono boost_chrono-mt +@@ -245,14 +244,6 @@ + message("Found $$lib") + BOOST_RANDOM = -l$$lib + } +- for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) { +- message("Found $$lib") +- BOOST_SYS = -l$$lib +- } +- for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.a) { +- message("Found $$lib") +- BOOST_SYS = -l$$lib +- } + !c++11 { + for(lib, BOOST_CHRONO):exists($${dir}/lib$${lib}.so*) { + message("Found $$lib") +@@ -266,14 +257,14 @@ + } + } + c++11 { +- BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_RANDOM $$BOOST_SYS +- !count(BOOST_LIBS, 7){ ++ BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_RANDOM ++ !count(BOOST_LIBS, 6){ + error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } + } + !c++11 { +- BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_RANDOM $$BOOST_SYS $$BOOST_CHRONO +- !count(BOOST_LIBS, 8){ ++ BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_RANDOM $$BOOST_CHRONO ++ !count(BOOST_LIBS, 7){ + error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } + } diff --git a/games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix1.patch b/games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix1.patch deleted file mode 100644 index cfdcf9b7da..0000000000 --- a/games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix1.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c769c9238ad62178f506038178714a1c35aa2769 Mon Sep 17 00:00:00 2001 -From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> -Date: Tue, 16 Apr 2019 08:38:01 +0200 -Subject: [PATCH] Replace make_shared with new in some cases - -Replace make_shared for asio types that take a lib::ref as a parameter. -This should fix the ASIO change (boostorg/asio@59066d8) for 1.70, -while keeping it backwards compatible to older boost versions. ---- - websocketpp/transport/asio/connection.hpp | 7 ++++--- - websocketpp/transport/asio/endpoint.hpp | 3 +-- - websocketpp/transport/asio/security/none.hpp | 3 +-- - websocketpp/transport/asio/security/tls.hpp | 3 +-- - 4 files changed, 7 insertions(+), 9 deletions(-) - -diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp -index 60f88a79..1ccda8f3 100644 ---- a/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type { - * needed. - */ - timer_ptr set_timer(long duration, timer_handler callback) { -- timer_ptr new_timer = lib::make_shared( -- lib::ref(*m_io_service), -- lib::asio::milliseconds(duration) -+ timer_ptr new_timer( -+ new lib::asio::steady_timer( -+ *m_io_service, -+ lib::asio::milliseconds(duration)) - ); - - if (config::enable_multithreading) { -diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp -index ddab2c74..4b719a97 100644 ---- a/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -195,8 +195,7 @@ class endpoint : public config::socket_type { - - m_io_service = ptr; - m_external_io_service = true; -- m_acceptor = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); - - m_state = READY; - ec = lib::error_code(); -diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp -index 5c8293db..6c7d3524 100644 ---- a/websocketpp/transport/asio/security/none.hpp -+++ b/websocketpp/transport/asio/security/none.hpp -@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this { - return socket::make_error_code(socket::error::invalid_state); - } - -- m_socket = lib::make_shared( -- lib::ref(*service)); -+ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, *m_socket); -diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp -index c76fd9aa..04ac3790 100644 ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this { - if (!m_context) { - return socket::make_error_code(socket::error::invalid_tls_context); - } -- m_socket = lib::make_shared( -- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); -+ m_socket.reset(new socket_type(*service, *m_context)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, get_socket()); diff --git a/games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch b/games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch deleted file mode 100644 index 64faab9d37..0000000000 --- a/games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f810ca2e800e9b55be41c5911cf1d1185fcd516b Mon Sep 17 00:00:00 2001 -From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> -Date: Wed, 17 Apr 2019 10:06:18 +0000 -Subject: [PATCH] Fix missed entries; fix testing - -(Note: the CmakeLists.txt patch is cut off because we don't have it) - ---- - CMakeLists.txt | 2 +- - websocketpp/transport/asio/connection.hpp | 3 +-- - websocketpp/transport/asio/endpoint.hpp | 7 ++----- - 3 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp -index 1ccda8f3..57dda74a 100644 ---- a/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -462,8 +462,7 @@ class connection : public config::socket_type::socket_con_type { - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared( -- lib::ref(*io_service)); -+ m_strand.reset(new lib::asio::io_service::strand(*io_service)); - } - - lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, -diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp -index 4b719a97..94509adb 100644 ---- a/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -687,9 +687,7 @@ class endpoint : public config::socket_type { - * @since 0.3.0 - */ - void start_perpetual() { -- m_work = lib::make_shared( -- lib::ref(*m_io_service) -- ); -+ m_work.reset(new lib::asio::io_service::work(*m_io_service)); - } - - /// Clears the endpoint's perpetual flag, allowing it to exit when empty -@@ -853,8 +851,7 @@ class endpoint : public config::socket_type { - - // Create a resolver - if (!m_resolver) { -- m_resolver = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); - } - - tcon->set_uri(u); diff --git a/games/pokerth/pokerth.SlackBuild b/games/pokerth/pokerth.SlackBuild index 338635b115..a08c21dc8f 100644 --- a/games/pokerth/pokerth.SlackBuild +++ b/games/pokerth/pokerth.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pokerth. -# Copyright 20202024 Matteo Bernardini +# Copyright 2020-2025 Matteo Bernardini # Copyright 2009-2015 Marcel Saegebarth # Copyright 2012 Laurent Nardou # All rights reserved. @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pokerth -VERSION=${VERSION:-20230930_ecf031e} +VERSION=${VERSION:-20250404_1a8a157} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -42,9 +42,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -83,11 +80,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -( cd src/third_party/websocketpp - patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.70-websocket-fix1.patch - patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch ) - patch -p1 < $CWD/patches/pokerth-1.1.2-newer-protobuf.patch +patch -p1 < $CWD/patches/boost_1.89.patch +patch -p1 < $CWD/patches/boost_1.89_2.patch qmake-qt5 QMAKE_CFLAGS_ISYSTEM= -spec linux-g++ pokerth.pro make diff --git a/games/pokerth/pokerth.info b/games/pokerth/pokerth.info index fe6981d55a..0c44e4acd9 100644 --- a/games/pokerth/pokerth.info +++ b/games/pokerth/pokerth.info @@ -1,8 +1,8 @@ PRGNAM="pokerth" -VERSION="20230930_ecf031e" +VERSION="20250404_1a8a157" HOMEPAGE="https://www.pokerth.net" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/pokerth-20230930_ecf031e.tar.xz" -MD5SUM="e6cf4a9441832f6657afe89186dff7a2" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/pokerth-20250404_1a8a157.tar.xz" +MD5SUM="2927ad2bb47c876c981c2c487eb84364" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgsasl libircclient tinyxml protobuf3" diff --git a/games/scummvm/scummvm.SlackBuild b/games/scummvm/scummvm.SlackBuild index 0056e7016c..461ea7239e 100644 --- a/games/scummvm/scummvm.SlackBuild +++ b/games/scummvm/scummvm.SlackBuild @@ -86,12 +86,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 {} \; -# avoid linking breakage on i?86 -if [[ $ARCH == i?86 ]]; then linker=bfd; else linker=gold; fi - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="-fuse-ld=$linker" \ ./configure \ --prefix=/usr \ --bindir=/usr/games \ diff --git a/games/smc/boost-1.89.patch b/games/smc/boost-1.89.patch new file mode 100644 index 0000000000..5f46771cd4 --- /dev/null +++ b/games/smc/boost-1.89.patch @@ -0,0 +1,31 @@ +diff -Naur smc-20140328.orig/configure.ac smc-20140328/configure.ac +--- smc-20140328.orig/configure.ac 2014-03-29 00:06:03.000000000 +0100 ++++ smc-20140328/configure.ac 2025-10-02 21:03:41.393373349 +0200 +@@ -26,10 +26,6 @@ + AC_CHECK_LIB([boost_thread], [main], , + [AC_MSG_ERROR([Unable to find Boost Thread library])]) + +-# Check for the Boost System library +-AC_CHECK_LIB([boost_system], [main], , +- [AC_MSG_ERROR([Unable to find Boost System library])]) +- + # Check for the OpenGL and GLU library + case "${host}" in + *darwin*|*macosx*) +diff -Naur smc-20140328.orig/src/core/filesystem/filesystem.cpp smc-20140328/src/core/filesystem/filesystem.cpp +--- smc-20140328.orig/src/core/filesystem/filesystem.cpp 2014-03-29 00:06:04.000000000 +0100 ++++ smc-20140328/src/core/filesystem/filesystem.cpp 2025-10-02 21:14:57.185373349 +0200 +@@ -15,8 +15,12 @@ + + #include "../../core/filesystem/filesystem.h" + #include "../../core/game_core.h" ++#include "../../core/global_basic.h" ++#include ++ ++using namespace std; ++ + // boost filesystem +-#include "boost/filesystem/convenience.hpp" + namespace fs = boost::filesystem; + // needed for the stat function and to get the user directory on unix + #include diff --git a/games/smc/smc.SlackBuild b/games/smc/smc.SlackBuild index 3f05ae23fc..f915236b2e 100644 --- a/games/smc/smc.SlackBuild +++ b/games/smc/smc.SlackBuild @@ -76,6 +76,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +patch -p1 < $CWD/boost-1.89.patch + ./autogen.sh export PKG_CONFIG_PATH=/opt/CEGUI0.7/lib$LIBDIRSUFFIX/pkgconfig diff --git a/games/snes9x/snes9x.SlackBuild b/games/snes9x/snes9x.SlackBuild index 9b94e185d7..8dd60f01b6 100644 --- a/games/snes9x/snes9x.SlackBuild +++ b/games/snes9x/snes9x.SlackBuild @@ -113,6 +113,8 @@ if pkg-config --exists portaudio-2.0 && [ "${PORTAUDIO:-yes}" = "yes" ]; then PA_OPT="-DUSE_PORTAUDIO=ON" fi +sed -i '/#include /a #include ' external/glslang/SPIRV/SpvBuilder.h + SLKCFLAGS+=" -DNDEBUG" mkdir -p gtk/build cd gtk/build @@ -124,6 +126,7 @@ cd gtk/build $PULSEOPT $OSSOPT $PA_OPT \ -DCMAKE_INSTALL_DATAROOTDIR=share \ -DUSE_SYSTEMZIP=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install/strip DESTDIR=$PKG diff --git a/games/supertux/supertux.SlackBuild b/games/supertux/supertux.SlackBuild index a492e216aa..c6b01394fd 100644 --- a/games/supertux/supertux.SlackBuild +++ b/games/supertux/supertux.SlackBuild @@ -29,9 +29,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=supertux -VERSION=${VERSION:-0.6.3} -SRCVERSION=$(echo $VERSION | tr _ - ) -BUILD=${BUILD:-2} +VERSION=${VERSION:-20250817_6697d02} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -43,9 +42,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -74,9 +70,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRCVERSION -tar xvf $CWD/SuperTux-v$SRCVERSION-Source.tar.gz -cd SuperTux-v$SRCVERSION-Source +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/supertux-$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/games/supertux/supertux.info b/games/supertux/supertux.info index 05ef0681d9..1c3fd88ee9 100644 --- a/games/supertux/supertux.info +++ b/games/supertux/supertux.info @@ -1,8 +1,8 @@ PRGNAM="supertux" -VERSION="0.6.3" +VERSION="20250817_6697d02" HOMEPAGE="https://github.com/SuperTux/supertux" -DOWNLOAD="https://github.com/SuperTux/supertux/releases/download/v0.6.3/SuperTux-v0.6.3-Source.tar.gz" -MD5SUM="798d5518d3f4672ee0bac92693063c2f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/supertux-20250817_6697d02.tar.xz" +MD5SUM="809730b27f27a5087e96c706f2ff070b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs glm" diff --git a/games/supertuxkart/cmake4.patch b/games/supertuxkart/cmake4.patch new file mode 100644 index 0000000000..d87dc36211 --- /dev/null +++ b/games/supertuxkart/cmake4.patch @@ -0,0 +1,24 @@ +diff -Naur SuperTuxKart-1.4-src.orig/CMakeLists.txt SuperTuxKart-1.4-src/CMakeLists.txt +--- SuperTuxKart-1.4-src.orig/CMakeLists.txt 2022-10-31 22:00:41.000000000 +0100 ++++ SuperTuxKart-1.4-src/CMakeLists.txt 2025-07-28 15:43:38.715368259 +0200 +@@ -7,7 +7,7 @@ + add_definitions( -DSUPERTUXKART_VERSION="${PROJECT_VERSION}" ) + + if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3)) +- cmake_policy(SET CMP0043 OLD) ++ cmake_policy(SET CMP0043 NEW) + endif() + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake") +diff -Naur SuperTuxKart-1.4-src.orig/lib/wiiuse/CMakeLists.txt SuperTuxKart-1.4-src/lib/wiiuse/CMakeLists.txt +--- SuperTuxKart-1.4-src.orig/lib/wiiuse/CMakeLists.txt 2022-10-31 22:00:48.000000000 +0100 ++++ SuperTuxKart-1.4-src/lib/wiiuse/CMakeLists.txt 2025-07-28 15:45:38.170368259 +0200 +@@ -7,7 +7,7 @@ + # Added for STK, silences CMake warning + # See https://github.com/supertuxkart/stk-code/commit/b0ff15873ee7fa8901672672b47def9039a5534b#diff-a3e272598233e89e4b577a434cc2a89d + if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3)) +- cmake_policy(SET CMP0048 OLD) ++ cmake_policy(SET CMP0048 NEW) + endif() + + # Set package properties diff --git a/games/supertuxkart/gcc15-1.patch b/games/supertuxkart/gcc15-1.patch new file mode 100644 index 0000000000..cb91d91810 --- /dev/null +++ b/games/supertuxkart/gcc15-1.patch @@ -0,0 +1,49 @@ +From c46e1ce457529cc575543eb9186702216913fccd Mon Sep 17 00:00:00 2001 +From: CodingJellyfish +Date: Wed, 19 Feb 2025 17:20:15 +0800 +Subject: [PATCH] Fix #5301 + +--- + lib/mcpp/system.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/mcpp/system.c b/lib/mcpp/system.c +index a5b0d85c742..9b8ffeec6c3 100644 +--- a/lib/mcpp/system.c ++++ b/lib/mcpp/system.c +@@ -3435,7 +3435,7 @@ static int open_file( + if (! fullname) /* Non-existent or directory */ + return FALSE; + if (standard && included( fullname)) /* Once included */ +- goto true; ++ goto case_true; + + if ((max_open != 0 && max_open <= include_nest) + /* Exceed the known limit of open files */ +@@ -3462,12 +3462,12 @@ static int open_file( + if ((fp = fopen( fullname, "r")) == NULL) { + file->fp = fopen( cur_fullname, "r"); + fseek( file->fp, file->pos, SEEK_SET); +- goto false; ++ goto case_false; + } + if (max_open == 0) /* Remember the limit of the system */ + max_open = include_nest; + } else if (fp == NULL) /* No read permission */ +- goto false; ++ goto case_false; + /* Truncate buffer of the includer to save memory */ + len = (int) (file->bptr - file->buffer); + if (len) { +@@ -3514,9 +3514,9 @@ static int open_file( + if (mkdep && ((mkdep & MD_SYSHEADER) || ! infile->sys_header)) + put_depend( fullname); /* Output dependency line */ + +-true: ++case_true: + return TRUE; +-false: ++case_false: + free( fullname); + return FALSE; + } diff --git a/games/supertuxkart/gcc15-2.patch b/games/supertuxkart/gcc15-2.patch new file mode 100644 index 0000000000..0d22a38549 --- /dev/null +++ b/games/supertuxkart/gcc15-2.patch @@ -0,0 +1,21 @@ +From e9ab89eb6408c0bf4b94f64d19c6b7f6e7d909e7 Mon Sep 17 00:00:00 2001 +From: Gwyn Ciesla +Date: Wed, 19 Feb 2025 09:26:12 -0600 +Subject: [PATCH] Add include to work with gcc15. + +--- + src/network/remote_kart_info.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/network/remote_kart_info.hpp b/src/network/remote_kart_info.hpp +index 80a6339187c..9865dcda8c3 100644 +--- a/src/network/remote_kart_info.hpp ++++ b/src/network/remote_kart_info.hpp +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + enum KartTeam : int8_t + { diff --git a/games/supertuxkart/supertuxkart.SlackBuild b/games/supertuxkart/supertuxkart.SlackBuild index dca8d9ebc8..1a7ee21671 100644 --- a/games/supertuxkart/supertuxkart.SlackBuild +++ b/games/supertuxkart/supertuxkart.SlackBuild @@ -93,6 +93,10 @@ find -L . \ patch -p1 < $CWD/gcc13-1.patch patch -p1 < $CWD/gcc13-2.patch +patch -p1 < $CWD/cmake4.patch +patch -p1 < $CWD/gcc15-1.patch +patch -p1 < $CWD/gcc15-2.patch + mkdir -p build cd build cmake \ @@ -100,6 +104,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ $recorder .. make VERBOSE=1 make install DESTDIR=$PKG diff --git a/games/tome/aur-tome4.patch b/games/tome/aur-tome4.patch new file mode 100644 index 0000000000..7c24269af3 --- /dev/null +++ b/games/tome/aur-tome4.patch @@ -0,0 +1,457 @@ +diff -Naur orig/build/runner.lua new/build/runner.lua +--- orig/build/runner.lua 2014-05-19 10:42:12.000000000 +0200 ++++ new/build/runner.lua 2020-10-30 23:01:51.861023690 +0100 +@@ -24,28 +24,28 @@ + files { "../src/runner/main.c", "../src/getself.c" } + links { "m" } + +- configuration "linux" ++ filter "system:linux" + links { "dl", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + +- configuration "bsd" ++ filter "system:bsd" + links { "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32", "wsock32" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + linkoptions { "../src/windows/icon.res" } + +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + linkoptions { "-framework SDL", "-framework SDL_image", "-framework SDL_ttf", "-framework SDL_mixer", "-framework Cocoa", "-framework OpenGL" } + links { "IOKit" } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/t-engine ../t-engine", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/t-engine ../t-engine", } + + project "te4runner" +@@ -58,19 +58,19 @@ + files { "../src/runner/runner.c", "../src/physfs.c", "../src/auxiliar.c" } + links { "runner-physfs", "runner-lua", "m" } + +- configuration "linux" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } +- configuration "bsd" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } +- +- configuration "windows" +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:linux" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } ++ filter "system:bsd" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } ++ ++ filter "system:windows" ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/te4runner.tec ../", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/te4runner.tec ../", } + + project "runner-physfs" +@@ -83,13 +83,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL.framework/Headers" } + +diff -Naur orig/build/te4core.lua new/build/te4core.lua +--- orig/build/te4core.lua 2019-10-03 15:35:43.000000000 +0200 ++++ new/build/te4core.lua 2020-10-30 23:05:15.066698600 +0100 +@@ -40,11 +40,11 @@ + links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip", "te4-wfc", "utf8proc" } + if _OPTIONS.discord then defines { "DISCORD_TE4" } end + defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "TE4CORE_VERSION="..TE4CORE_VERSION } + buildoptions { "-O3" } + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + + if _OPTIONS.relpath == "32" then defines{"TE4_RELPATH32"} end + if _OPTIONS.relpath == "64" then defines{"TE4_RELPATH64"} end +@@ -63,7 +63,7 @@ + prelinkcommands { "i686-pc-mingw32-ranlib ../bin/Debug/*.a" } + end + +- configuration "macosx" ++ filter "system:macosx" + files { "../src/mac/SDL*" } + includedirs { + "/System/Library/Frameworks/OpenGL.framework/Headers", +@@ -84,7 +84,7 @@ + "/usr/local/include", + "/usr/local/opt/libpng12/include", + } +- defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH='"/Library/Application Support/T-Engine/"']] } ++ defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH="/Library/Application Support/T-Engine/"]] } + linkoptions { + "-framework Cocoa", + "-framework OpenGL", +@@ -108,9 +108,9 @@ + targetdir "." + links { "IOKit" } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "OpenAL32", "vorbisfile", "opengl32", "glu32", "wsock32", "png" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + if _OPTIONS.wincross then + prebuildcommands { "i686-pc-mingw32-windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + else +@@ -118,33 +118,33 @@ + end + linkoptions { "../src/windows/icon.res" } + linkoptions { "-mwindows" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + libdirs {"/opt/SDL-2.0/lib/"} + links { "dl", "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } + linkoptions { "-Wl,-E" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + if steamlin64 then steamlin64() end + +- configuration "bsd" ++ filter "system:bsd" + libdirs {"/usr/local/lib/"} + links { "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Debug/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Release/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +@@ -165,13 +165,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL2.framework/Headers" } + +@@ -230,7 +230,7 @@ + defines { "LJ_ABI_SOFTFP=0" } + end + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"', +@@ -238,7 +238,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/minilua ../src/luajit2/src/host/", } +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"', +@@ -332,7 +332,7 @@ + + files { "../src/luajit2/src/host/buildvm*.c" } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"', +@@ -344,7 +344,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/buildvm ../src/luajit2/src/", } +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"', +@@ -367,7 +367,7 @@ + files { "../src/luajit2/src/*.c", "../src/luajit2/src/*.s", "../src/luajit2/src/lj_vm.s", "../src/luajit2/src/lj_bcdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_libdef.h", "../src/luajit2/src/lj_recdef.h", "../src/luajit2/src/lj_folddef.h" } + excludes { "../src/luajit2/src/buildvm*.c", "../src/luajit2/src/luajit.c", "../src/luajit2/src/ljamalg.c" } + +- configuration "linux" ++ filter "system:linux" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -381,7 +381,7 @@ + } + end + +- configuration "bsd" ++ filter "system:bsd" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -395,7 +395,7 @@ + } + end + +- configuration "macosx" ++ filter "system:macosx" + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ + "../src/luajit2/src/buildvm -m machasm -o ../src/luajit2/src/lj_vm.s", +@@ -407,7 +407,7 @@ + "../src/luajit2/src/buildvm -m folddef -o ../src/luajit2/src/lj_folddef.h ../src/luajit2/src/lj_opt_fold.c", + } + +- configuration "windows" ++ filter "system:windows" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -429,7 +429,7 @@ + targetname "luasocket" + buildoptions { "-O2" } + +- configuration "not windows" ++ filter "system:not windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -445,7 +445,7 @@ + "../src/luasocket/usocket.c", + "../src/luasocket/mime.c", + } +- configuration "windows" ++ filter "system:windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -583,21 +583,21 @@ + buildoptions { "-O3", "-std=c++11" } + cppconfig("web") + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end + + files { "../src/web-cef3/*.cpp", } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "windows" ++ filter "system:windows" + defines { 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"} + libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"} + includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"} +@@ -619,19 +619,19 @@ + "../src/web-cef3/spawn.cpp", + } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "linux" ++ filter "system:linux" + buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"} + libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"} + includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"} + links { "cef", "cef_dll_wrapper" } +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + defines { 'SELFEXE_LINUX' } + end + +@@ -641,7 +641,7 @@ + + if _OPTIONS.discord and not _OPTIONS['discord-nolib'] then + project "te4-discord" +- configuration "linux" ++ filter "system:linux" + kind "SharedLib" + language "C++" + targetname "discord-rpc" +@@ -654,11 +654,11 @@ + files { "../src/discord-rpc/src/discord-rpc.cpp", "../src/discord-rpc/src/rpc_connection.cpp", "../src/discord-rpc/src/serialization.cpp", } + files { "../src/discord-rpc/src/connection_unix.cpp", "../src/discord-rpc/src/discord_register_linux.cpp", } + +- configuration "windows" ++ filter "system:windows" + kind "SharedLib" + -- Empty + +- configuration "macosx" ++ filter "system:macosx" + kind "SharedLib" + -- Empty + end +diff -Naur orig/premake5.lua new/premake5.lua +--- orig/premake5.lua 2019-09-13 11:46:14.000000000 +0200 ++++ new/premake5.lua 2020-10-30 23:04:41.500196031 +0100 +@@ -1,6 +1,6 @@ + dofile("build/options.lua") + +-solution "TEngine" ++workspace "TEngine" + configurations { "Debug", "Release" } + objdir "obj" + defines {"GLEW_STATIC"} +@@ -30,7 +30,7 @@ + } + else + includedirs { +- "/opt/SDL-2.0/include/SDL2", ++ "/usr/include/SDL2", + "/usr/include/GL", + } + end +@@ -42,7 +42,7 @@ + dofile("steamworks/build/steam-def.lua") + end + +-configuration "bsd" ++filter "system:bsd" + libdirs { + "/usr/local/lib", + } +@@ -51,7 +51,7 @@ + } + + if _OPTIONS.wincross then +-configuration "windows" ++filter "system:windows" + libdirs { + "/Test/xcompile/local//lib", + } +@@ -60,7 +60,7 @@ + "/Test/xcompile/local/include", + } + else +-configuration "windows" ++filter "system:windows" + libdirs { + "/c/code/SDL/lib", + } +@@ -72,7 +72,7 @@ + end + + cppconfig = function(what) +- if os.get() == "macosx" then ++ if os.target() == "macosx" then + if what == "web" then + buildoptions { "-stdlib=libstdc++" } + linkoptions { "-stdlib=libstdc++" } +@@ -84,9 +84,8 @@ + -- links { "stdc++" } + end + +-configuration "macosx" +- premake.gcc.cc = 'clang' +- premake.gcc.cxx = 'clang++' ++filter "system:macosx" ++ toolset("clang") + + buildoptions { "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk", "-mmacosx-version-min=10.7" } + includedirs { +@@ -95,9 +94,9 @@ + "/Library/Frameworks/SDL2_ttf.framework/Headers", + } + +-configuration "Debug" ++filter "Debug" + defines { } +- flags { "Symbols" } ++ symbols "On" + buildoptions { "-ggdb" } + -- buildoptions { "-O3" } + targetdir "bin/Debug" +@@ -105,9 +104,10 @@ + if _OPTIONS.pedantic then buildoptions { "-Wall" } end + defines {"TE4_LUA_ALLOW_GENERIC_IO"} + +-configuration "Release" ++filter "Release" + defines { "NDEBUG=1" } +- flags { "Optimize", "NoFramePointer" } ++ optimize "On" ++ omitframepointer "On" + buildoptions { "-O2" } + targetdir "bin/Release" + diff --git a/games/tome/tome.SlackBuild b/games/tome/tome.SlackBuild index d37a7f5d97..2d75744331 100644 --- a/games/tome/tome.SlackBuild +++ b/games/tome/tome.SlackBuild @@ -86,15 +86,15 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -# correction of SDL2 headers directory -sed -i "s/opt\/SDL-2.0/usr/" premake4.lua +cp premake4.lua premake5.lua +patch -p1 < $CWD/aur-tome4.patch # build game # 20241018 bkw: added -j1 to make. Without it, the build was failing # about 50% of the time. With it, it built successfully 10 times in # a row. -premake4 gmake -env -u ARCH make -j1 +premake5 gmake +env -u ARCH CFLAGS="$SLKCFLAGS -fpermissive -std=gnu17" make -j1 # copy the data game mkdir -p $PKG/usr/share/games/$PRGNAM $PKG/usr/bin diff --git a/games/tome/tome.info b/games/tome/tome.info index 0c38f5245c..506961c8cf 100644 --- a/games/tome/tome.info +++ b/games/tome/tome.info @@ -5,6 +5,6 @@ DOWNLOAD="https://te4.org/dl/t-engine/t-engine4-src-1.7.6.tar.bz2" MD5SUM="31e78cd88b383a3a8667e2fd90abfd2b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="premake" +REQUIRES="premake5" MAINTAINER="Dimitris Zlatanidis" EMAIL="dslackw@gmail.com" diff --git a/games/trackballs/cross.patch b/games/trackballs/cross.patch new file mode 100644 index 0000000000..7f0adfac9e --- /dev/null +++ b/games/trackballs/cross.patch @@ -0,0 +1,11 @@ +--- a/src/glHelp.h ++++ b/src/glHelp.h +@@ -27,7 +27,7 @@ + + #include "general.h" + +-typedef struct _TTF_Font TTF_Font; ++typedef struct TTF_Font TTF_Font; + typedef struct SDL_Surface SDL_Surface; + class Map; + class Game; diff --git a/games/trackballs/trackballs.SlackBuild b/games/trackballs/trackballs.SlackBuild index cad5b4bd50..8a389c2b99 100644 --- a/games/trackballs/trackballs.SlackBuild +++ b/games/trackballs/trackballs.SlackBuild @@ -67,6 +67,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +patch -p1 < $CWD/cross.patch + mkdir -p build cd build cmake \ @@ -76,6 +78,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release \ .. make VERBOSE=1 diff --git a/games/warzone2100/SQLiteCPP-gcc15.patch b/games/warzone2100/SQLiteCPP-gcc15.patch new file mode 100644 index 0000000000..1e13941b65 --- /dev/null +++ b/games/warzone2100/SQLiteCPP-gcc15.patch @@ -0,0 +1,35 @@ +From a4287a72e12ff64aec2b6cc418a3726bb1a4b7a4 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sat, 7 Sep 2024 14:31:27 +0100 +Subject: [PATCH] SQLiteCpp/Statement.h: add missing `` include + +Without the change the build fails on `gcc-15` as: + + [ 5%] Building CXX object CMakeFiles/SQLiteCpp.dir/src/Backup.cpp.o + In file included from /build/source/include/SQLiteCpp/Column.h:14, + from /build/source/include/SQLiteCpp/Database.h:14, + from /build/source/include/SQLiteCpp/Backup.h:15, + from /build/source/src/Backup.cpp:12: + /build/source/include/SQLiteCpp/Statement.h:132:39: error: 'uint32_t' does not name a type + 132 | void bind(const int aIndex, const uint32_t aValue); + | ^~~~~~~~ + /build/source/include/SQLiteCpp/Statement.h:20:1: note: 'uint32_t' is defined in header ''; this is probably fixable by adding '#include ' + 19 | #include + +++ |+#include + 20 | +--- + include/SQLiteCpp/Statement.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/SQLiteCpp/Statement.h b/include/SQLiteCpp/Statement.h +index bb62a9f9..2f3adf7d 100644 +--- a/3rdparty/SQLiteCpp/include/SQLiteCpp/Statement.h ++++ b/3rdparty/SQLiteCpp/include/SQLiteCpp/Statement.h +@@ -14,6 +14,7 @@ + #include + #include // SQLITECPP_PURE_FUNC + ++#include + #include + #include + #include diff --git a/games/warzone2100/warzone2100.SlackBuild b/games/warzone2100/warzone2100.SlackBuild index 63407b6659..c90c2fca4e 100644 --- a/games/warzone2100/warzone2100.SlackBuild +++ b/games/warzone2100/warzone2100.SlackBuild @@ -91,6 +91,10 @@ 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/SQLiteCPP-gcc15.patch + +export CMAKE_POLICY_VERSION_MINIMUM=3.5 + mkdir -p build cd build cmake \ @@ -101,6 +105,7 @@ cd build -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DCMAKE_INSTALL_BINDIR=games \ + -DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF \ .. DESTDIR=$PKG cmake --build . --target install cd .. diff --git a/gis/grass/gdal-3.3.patch b/gis/grass/gdal-3.3.patch deleted file mode 100644 index c5e018aaaa..0000000000 --- a/gis/grass/gdal-3.3.patch +++ /dev/null @@ -1,84 +0,0 @@ -From b86314c7f3b8aea961d380dbb836087b3990d7af Mon Sep 17 00:00:00 2001 -From: nilason -Date: Thu, 6 May 2021 22:27:48 +0200 -Subject: [PATCH] v.hull: use standard C boolean type - -Fixes #1563 ---- - vector/v.hull/chull.c | 21 +++++++++------------ - 1 file changed, 9 insertions(+), 12 deletions(-) - -diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c -index 1ad97396fa..41b627c50f 100644 ---- a/vector/v.hull/chull.c -+++ b/vector/v.hull/chull.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -29,10 +30,6 @@ - - #include "globals.h" - --/*Define Boolean type */ --typedef enum --{ BFALSE, BTRUE } bool; -- - /* Define vertex indices. */ - #define X 0 - #define Y 1 -@@ -76,10 +73,10 @@ struct tFaceStructure - }; - - /* Define flags */ --#define ONHULL BTRUE --#define REMOVED BTRUE --#define VISIBLE BTRUE --#define PROCESSED BTRUE -+#define ONHULL true -+#define REMOVED true -+#define VISIBLE true -+#define PROCESSED true - - /* Global variable definitions */ - tVertex vertices = NULL; -@@ -436,7 +433,7 @@ bool AddOne(tVertex p) - tFace f; - tEdge e, temp; - long int vol; -- bool vis = BFALSE; -+ bool vis = false; - - - /* Mark faces visible from p. */ -@@ -446,7 +443,7 @@ bool AddOne(tVertex p) - - if (vol < 0) { - f->visible = VISIBLE; -- vis = BTRUE; -+ vis = true; - } - f = f->next; - } while (f != faces); -@@ -454,7 +451,7 @@ bool AddOne(tVertex p) - /* If no faces are visible from p, then p is inside the hull. */ - if (!vis) { - p->onhull = !ONHULL; -- return BFALSE; -+ return false; - } - - /* Mark edges in interior of visible region for deletion. -@@ -470,7 +467,7 @@ bool AddOne(tVertex p) - e->newface = MakeConeFace(e, p); - e = temp; - } while (e != edges); -- return BTRUE; -+ return true; - } - - /*--------------------------------------------------------------------- diff --git a/gis/grass/grass.SlackBuild b/gis/grass/grass.SlackBuild index 4f9beb9d72..149fc62fde 100644 --- a/gis/grass/grass.SlackBuild +++ b/gis/grass/grass.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=grass -VERSION=${VERSION:-7.8.0} +VERSION=${VERSION:-8.4.1} SHRTVER=$( echo $VERSION | sed "s/\([0-9]*\).\([0-9]*\)..*/\1\2/" ) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -80,8 +80,6 @@ find -L . \ # Option handling: set -- $(echo $ENABLE | sed 's/,/ /g') -patch -p1 < $CWD/gdal-3.3.patch - while [ "$1" != "" ]; do case "$1" in @@ -129,9 +127,9 @@ done # geos now always enabled: it's an indirect hard dep (via gdal), and makes grass nicer :-) +CPP="gcc -E -w" \ CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -fpermissive" \ -LDFLAGS="-ldl -lncurses" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/opt \ --exec-prefix=/wibble/usr \ @@ -161,19 +159,16 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ # Install the pkgconfig file: install -D -m0644 grass.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/grass.pc - -# Create unversioned symlinks: -( cd $PKG/opt ; ln -s $PRGNAM$SHRTVER $PRGNAM ) -( cd $PKG/usr/bin ; ln -s $PRGNAM$SHRTVER $PRGNAM ) - # Remove hardcoded version strings: sed -i -e "s/-${VERSION}//g" \ - $PKG/usr/bin/$PRGNAM$SHRTVER \ $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/grass.pc +# Create unversioned symlink: +( cd $PKG/opt ; ln -s $PRGNAM$SHRTVER $PRGNAM ) + # Remove packaging directory pollution: sed -i -e "s;$PKG;;" \ - $PKG/usr/bin/$PRGNAM$SHRTVER \ + $PKG/usr/bin/$PRGNAM \ $PKG/opt/$PRGNAM$SHRTVER/demolocation/.grassrc$SHRTVER \ $PKG/opt/$PRGNAM$SHRTVER/etc/fontcap \ $PKG/opt/$PRGNAM$SHRTVER/include/Make/Grass.make \ @@ -186,12 +181,12 @@ for i in $( find $PKGOPTMAN -type l ) ; do \ ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/man/man1 cp -a \ - $PKGOPTMAN/man1/grass7.1.gz \ + $PKGOPTMAN/man1/grass.1.gz \ $PKG/usr/man/man1/grass.1.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS CHANGES COPYING GPL.TXT REQUIREMENTS.html README.md SUBMITTING* TODO \ + AUTHORS COPYING GPL.TXT *.md TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -205,7 +200,6 @@ cp -a \ # Cleanup: rm -rf $PKG/opt/$PRGNAM/demolocation/PERMANENT/.tmp -rm $PKG/opt/$PRGNAM/config.status rm -rf $PKG/opt/$PRGNAM/share/ mkdir -p $PKG/install diff --git a/gis/grass/grass.info b/gis/grass/grass.info index c636164541..e06aa1cd79 100644 --- a/gis/grass/grass.info +++ b/gis/grass/grass.info @@ -1,10 +1,10 @@ PRGNAM="grass" -VERSION="7.8.0" +VERSION="8.4.1" HOMEPAGE="https://grass.osgeo.org/" -DOWNLOAD="https://grass.osgeo.org/grass78/source/grass-7.8.0.tar.gz" -MD5SUM="e9b9d3bbbfe3ef9055ea1398b2222de4" +DOWNLOAD="https://github.com/OSGeo/grass/archive/8.4.1/grass-8.4.1.tar.gz" +MD5SUM="2d09b354637955a3b48dbd0d78610d15" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gdal python3-numpy wxPython4" +REQUIRES="gdal pdal python3-numpy wxPython4" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" diff --git a/gis/libspatialite/libspatialite.SlackBuild b/gis/libspatialite/libspatialite.SlackBuild index ad44b1f1ba..0924c5da07 100644 --- a/gis/libspatialite/libspatialite.SlackBuild +++ b/gis/libspatialite/libspatialite.SlackBuild @@ -97,7 +97,7 @@ LDFLAGS="-ldl" \ --enable-geos370 \ --enable-geos3100 \ --enable-geos3100 \ - --enable-libxml2 \ + --enable-libxml2=no \ --enable-minizip \ --enable-geopackage \ --enable-examples \ diff --git a/gis/opencpn/README b/gis/opencpn/README deleted file mode 100644 index 7b1dd96ad5..0000000000 --- a/gis/opencpn/README +++ /dev/null @@ -1,8 +0,0 @@ -OpenCPN is a free software (GPLv2) project to create a concise chart -plotter and navigation software, for use underway or as a planning -tool. OpenCPN is developed by a team of active sailors using real -world conditions for program testing and refinement. - -If you are upgrading or installing new, OpenCPN 5.2.x needs wxGTK3 -to be built with webkit support. So you will have to install -webkit2gtk, available here at SBo, then build and install wxGTK3. diff --git a/gis/opencpn/doinst.sh b/gis/opencpn/doinst.sh deleted file mode 100644 index 3d2e9538d1..0000000000 --- a/gis/opencpn/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/gis/opencpn/opencpn.SlackBuild b/gis/opencpn/opencpn.SlackBuild deleted file mode 100644 index 0204b254d9..0000000000 --- a/gis/opencpn/opencpn.SlackBuild +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/bash - -# Slackware build script for opencpn - -# Copyright 2021 Matt Dinslage, Springfield, MO -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=opencpn -VERSION=${VERSION:-5.2.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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/OpenCPN-$VERSION.tar.gz -cd OpenCPN-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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 LIBDIR -if [ "$ARCH" = "x86_64" ]; then - sed -i '0,/"i386"/{s/"i386"/"x86_64"/}' cmake/GetArch.cmake - sed -i '0,/"lib"/{s/"lib"/"lib64"/}' cmake/GetArch.cmake -fi - -# Fix MANDIR -sed -i 's,${PREFIX_DATA}/man/man1,/usr/man/man1,g' CMakeLists.txt - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DOPCPN_FORCE_GTK3=ON \ - -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config \ - -DBUNDLE_GSHHS=CRUDE \ - -DBUNDLE_TCDATA=ON \ - -DBUNDLE_DOCS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -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 README data/doc/help_en_US.html data/license.txt $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share/doc -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -r $PKG/usr/share/icons/hicolor/* -mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps -cp $TMP/OpenCPN-$VERSION/src/bitmaps/other_svg_src/opencpn_logo.svg \ - $PKG/usr/share/icons/hicolor/scalable/apps/opencpn.svg - -mkdir -p $PKG/usr/share/pixmaps -convert $PKG/usr/share/icons/hicolor/scalable/apps/opencpn.svg -resize 256x256 \ - $PKG/usr/share/pixmaps/opencpn.png - -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 diff --git a/gis/opencpn/opencpn.info b/gis/opencpn/opencpn.info deleted file mode 100644 index a44554b6bb..0000000000 --- a/gis/opencpn/opencpn.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="opencpn" -VERSION="5.2.4" -HOMEPAGE="https://opencpn.org/" -DOWNLOAD="https://github.com/OpenCPN/OpenCPN/archive/v5.2.4/OpenCPN-5.2.4.tar.gz" -MD5SUM="9ca81bed7bca1706ecaac98a7578d6bb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gpsd tinyxml libmspack portaudio lsb-release webkit2gtk wxGTK3" -MAINTAINER="M.Dinslage" -EMAIL="daedra1980@gmail.com" diff --git a/gis/opencpn/slack-desc b/gis/opencpn/slack-desc deleted file mode 100644 index db7e4e4e3d..0000000000 --- a/gis/opencpn/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -opencpn: opencpn (A Chartplotter and GPS Navigation Software) -opencpn: -opencpn: OpenCPN is a free software (GPLv2) project to create a concise chart -opencpn: plotter and navigation software, for use underway or as a planning -opencpn: tool. OpenCPN is developed by a team of active sailors using real -opencpn: world conditions for program testing and refinement. -opencpn: -opencpn: -opencpn: -opencpn: -opencpn: diff --git a/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild b/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild index 1e9dffc224..8f8b6ad417 100644 --- a/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild +++ b/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild @@ -74,6 +74,8 @@ sed -i 's/oldest-supported-numpy/numpy>=1.19.3/' pyproject.toml PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') export PYTHONPATH=/opt/python$PYVER/site-packages +export CFLAGS="-fpermissive" + python3 -m build --no-isolation python3 -m installer -d "$PKG" dist/*.whl diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild index 426e0fa463..cf53bb5094 100644 --- a/graphics/Blender/Blender.SlackBuild +++ b/graphics/Blender/Blender.SlackBuild @@ -30,8 +30,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Blender -VERSION=${VERSION:-3.3.10} -BUILD=${BUILD:-5} +VERSION=${VERSION:-4.4.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -108,10 +108,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -sed -i -e '/#include /a #include ' intern/locale/boost_locale_wrapper.cpp sed -i -e '/#include "util\/windows.h"/a #include ' intern/cycles/util/thread.cpp sed -i -e '/#include /a #include ' extern/quadriflow/src/loader.cpp +# Need CMAKE_POLICY_VERSION_MINIMUM=3.5 for -current +if [ ! -x /usr/bin/gcc-11.* ]; then + export CMAKE_POLICY_VERSION_MINIMUM=3.5 +fi + mkdir -p build cd build cmake ../ \ diff --git a/graphics/Blender/Blender.info b/graphics/Blender/Blender.info index c8a898c573..73ca90bb77 100644 --- a/graphics/Blender/Blender.info +++ b/graphics/Blender/Blender.info @@ -1,8 +1,8 @@ PRGNAM="Blender" -VERSION="3.3.10" +VERSION="4.4.3" HOMEPAGE="https://blender.org" -DOWNLOAD="https://download.blender.org/source/blender-3.3.10.tar.xz" -MD5SUM="a190dbfc5dfd490d737ee64ba68ce79c" +DOWNLOAD="https://download.blender.org/source/blender-4.4.3.tar.xz" +MD5SUM="c9ba26fdb210276d5b1010633f6c3c2a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="freealut jack opencollada openimageio OpenSubdiv potrace pugixml python3-numpy valgrind" diff --git a/graphics/FreeCAD/FreeCAD.SlackBuild b/graphics/FreeCAD/FreeCAD.SlackBuild index f981cb2218..f3fb768e2f 100644 --- a/graphics/FreeCAD/FreeCAD.SlackBuild +++ b/graphics/FreeCAD/FreeCAD.SlackBuild @@ -94,6 +94,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/regex system /regex /' cMake/FreeCAD_Helpers/SetupBoost.cmake + mkdir build cd build cmake \ diff --git a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild index 487e48e9fb..d62137f771 100644 --- a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild +++ b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild @@ -118,6 +118,7 @@ cd build -DUSE_VTK=ON \ -D3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk-9.4 \ -D3RDPARTY_VTK_LIBRARY_DIR=/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/graphics/OpenShadingLanguage/OpenShadingLanguage.SlackBuild b/graphics/OpenShadingLanguage/OpenShadingLanguage.SlackBuild index 4cf361461f..db718a20d4 100644 --- a/graphics/OpenShadingLanguage/OpenShadingLanguage.SlackBuild +++ b/graphics/OpenShadingLanguage/OpenShadingLanguage.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=OpenShadingLanguage -VERSION=${VERSION:-1.13.12.0} +VERSION=${VERSION:-1.14.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,13 +76,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/llvm-20.patch - mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_POLICY_DEFAULT_CMP0175=OLD \ + -DCMAKE_POLICY_DEFAULT_CMP0167=OLD \ -DCMAKE_INSTALL_PREFIX=/usr \ -DUSE_partio=OFF \ -DUSE_Qt6=OFF \ diff --git a/graphics/OpenShadingLanguage/OpenShadingLanguage.info b/graphics/OpenShadingLanguage/OpenShadingLanguage.info index ad85778743..9bea8d0fb9 100644 --- a/graphics/OpenShadingLanguage/OpenShadingLanguage.info +++ b/graphics/OpenShadingLanguage/OpenShadingLanguage.info @@ -1,10 +1,10 @@ PRGNAM="OpenShadingLanguage" -VERSION="1.13.12.0" +VERSION="1.14.6.0" HOMEPAGE="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage" -DOWNLOAD="UNSUPPORTED" +DOWNLOAD="" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v1.13.12.0/OpenShadingLanguage-1.13.12.0.tar.gz" -MD5SUM_x86_64="ac8cc5c448eea7da03022e5f2f7de530" +DOWNLOAD_x86_64="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v1.14.6.0/OpenShadingLanguage-1.14.6.0.tar.gz" +MD5SUM_x86_64="9a9eb7ebd0570d76c0c007935157433c" REQUIRES="openimageio pugixml" MAINTAINER="Giancarlo Dessì" EMAIL="slack@giand.it" diff --git a/graphics/OpenShadingLanguage/llvm-20.patch b/graphics/OpenShadingLanguage/llvm-20.patch deleted file mode 100644 index 6b2387dec8..0000000000 --- a/graphics/OpenShadingLanguage/llvm-20.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- ./src/cmake/externalpackages.cmake 2024-12-05 05:29:41.000000000 +0100 -+++ ./src/cmake/fix-externalpackages.cmake 2025-06-29 21:05:17.517569272 +0200 -@@ -117,7 +117,7 @@ - # LLVM library setup - checked_find_package (LLVM REQUIRED - VERSION_MIN 9.0 -- VERSION_MAX 19.9 -+ VERSION_MAX 20.9 - PRINT LLVM_SYSTEM_LIBRARIES CLANG_LIBRARIES) - # ensure include directory is added (in case of non-standard locations - include_directories (BEFORE SYSTEM "${LLVM_INCLUDES}") - ---- ./src/include/OSL/platform.h 2024-12-05 05:29:41.000000000 +0100 -+++ ./src/include/OSL/fix-platform.h 2025-06-29 21:08:25.389584349 +0200 -@@ -20,6 +20,7 @@ - - #include - #include -+#include - - #include - - ---- ./src/liboslexec/llvm_util.cpp 2025-06-29 21:12:28.283603841 +0200 -+++ ./src/liboslexec/fix-llvm_util.cpp 2025-06-29 21:12:47.262605365 +0200 -@@ -3204,7 +3204,11 @@ - llvm::Type* - LLVM_Util::type_union(cspan types) - { -+#if OSL_LLVM_VERSION >= 200 -+ llvm::DataLayout target(module()->getDataLayout()); -+#else - llvm::DataLayout target(module()); -+#endif - size_t max_size = 0; - size_t max_align = 1; - for (auto t : types) { diff --git a/graphics/darktable/README b/graphics/darktable/README index 3b3bf0c2bb..c8bf5dced7 100644 --- a/graphics/darktable/README +++ b/graphics/darktable/README @@ -23,6 +23,7 @@ colord - for colour profile management colord-gtk - for colour profile management osm-gps-map - for map georeferencing jsonschema - for checking noise profiles +libavif - for av1 image format support If you have nVidia or AMD/ATI graphics with more than 1Gb of memory, nvidia-driver (or nvidia-legacy340/304-driver) or amd-app-sdk is an diff --git a/graphics/darktable/darktable.SlackBuild b/graphics/darktable/darktable.SlackBuild index 1cc78382f4..5fbfad3fc7 100644 --- a/graphics/darktable/darktable.SlackBuild +++ b/graphics/darktable/darktable.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=darktable -VERSION=${VERSION:-4.2.1} +VERSION=${VERSION:-5.0.1} BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -46,9 +46,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -88,6 +85,9 @@ find -L . \ #export CC=clang #export CXX=clang++ +# gcc-15 compatibility; cf. 9d7ab0e, c2be549, 44884e3 +patch -p0 < $CWD/gcc-15.patch + mkdir -p build cd build cmake \ @@ -100,9 +100,8 @@ cd build -DDONT_USE_INTERNAL_LUA=Off \ -DUSE_LIBSECRET=On \ -DBINARY_PACKAGE_BUILD=1 \ - -DLensFun_INCLUDE_DIR="/opt/$LENSFUN/include/lensfun" \ - -DLensFun_LIBRARIES="/opt/$LENSFUN/lib$LIBDIRSUFFIX" \ - -DLensFun_LIBRARY="/opt/$LENSFUN/lib$LIBDIRSUFFIX/liblensfun.so" \ + -DBUILD_CURVE_TOOLS=ON \ + -DBUILD_NOISE_TOOLS=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/graphics/darktable/darktable.info b/graphics/darktable/darktable.info index d7904b3b6b..5d57591c2b 100644 --- a/graphics/darktable/darktable.info +++ b/graphics/darktable/darktable.info @@ -1,10 +1,10 @@ PRGNAM="darktable" -VERSION="4.2.1" +VERSION="5.0.1" HOMEPAGE="https://www.darktable.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/darktable-org/darktable/releases/download/release-4.2.1/darktable-4.2.1.tar.xz" -MD5SUM_x86_64="ac7b028c0768f19ce9cb604beaac3d86" -REQUIRES="gmic pugixml lensfun03" +DOWNLOAD_x86_64="https://github.com/darktable-org/darktable/releases/download/release-5.0.1/darktable-5.0.1.tar.xz" +MD5SUM_x86_64="f6264828764c26d3840de5796d3173d3" +REQUIRES="gmic pugixml" MAINTAINER="K. Eugene Carlson" EMAIL="kvngncrlsn@gmail.com" diff --git a/graphics/darktable/gcc-15.patch b/graphics/darktable/gcc-15.patch new file mode 100644 index 0000000000..8dd3fbaf66 --- /dev/null +++ b/graphics/darktable/gcc-15.patch @@ -0,0 +1,93 @@ +--- src/common/colorspaces.h.old 2025-06-15 12:30:11.232484562 +0900 ++++ src/common/colorspaces.h 2025-06-15 12:30:56.494475146 +0900 +@@ -22,6 +22,8 @@ + + #include + ++G_BEGIN_DECLS ++ + // this was removed from lcms2 in 2.4 + #ifndef TYPE_XYZA_FLT + #define TYPE_XYZA_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_XYZ)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)) +@@ -419,6 +421,8 @@ + const float whitepoint[2], + dt_colormatrix_t RGB_to_XYZ_transposed); + ++G_END_DECLS ++ + // clang-format off + // modelines: These editor modelines have been set for all relevant files by tools/update_modelines.py + // vim: shiftwidth=2 expandtab tabstop=2 cindent +--- src/lua/lua.h.old 2025-06-15 12:28:15.777917047 +0900 ++++ src/lua/lua.h 2025-06-15 12:29:17.539297513 +0900 +@@ -27,6 +27,8 @@ + #include "common/dtpthread.h" + #include + ++G_BEGIN_DECLS ++ + #ifdef USE_LUA + #include + #include +@@ -97,6 +99,8 @@ + } dt_lua_state_t; + #endif + ++G_END_DECLS ++ + // clang-format off + // modelines: These editor modelines have been set for all relevant files by tools/update_modelines.py + // vim: shiftwidth=2 expandtab tabstop=2 cindent +--- src/imageio/format/imageio_format_api.h.old 2025-06-15 12:33:53.630277557 +0900 ++++ src/imageio/format/imageio_format_api.h 2025-06-15 12:35:41.680143609 +0900 +@@ -20,10 +20,6 @@ + + #ifdef FULL_API_H + +-#ifdef __cplusplus +-extern "C" { +-#endif +- + #include + #include + +@@ -33,6 +29,8 @@ + + #include "common/colorspaces.h" // because forward declaring enums doesn't work in C++ :( + ++G_BEGIN_DECLS ++ + /* early definition of modules to do type checking */ + + #pragma GCC visibility push(default) +@@ -96,9 +94,7 @@ + + #pragma GCC visibility pop + +-#ifdef __cplusplus +-} +-#endif ++G_END_DECLS + + #endif // FULL_API_H + +--- src/iop/rawdenoise.c.old 2025-06-15 12:41:52.683427928 +0900 ++++ src/iop/rawdenoise.c 2025-06-15 12:42:55.833442695 +0900 +@@ -229,7 +229,7 @@ + const float *const restrict inp = in + (size_t)row * roi->width + offset; + const int senselwidth = (roi->width-offset+1)/2; + for(int col = 0; col < senselwidth; col++) +- fimgp[col] = sqrtf(MAX(0.0f, inp[2*col])); ++ fimgp[col] = sqrtf(fmaxf(0.0f, inp[2*col])); + } + + // perform the wavelet decomposition and denoising +@@ -301,7 +301,7 @@ + + static inline float vstransform(const float value) + { +- return sqrtf(MAX(0.0f, value)); ++ return sqrtf(fmaxf(0.0f, value)); + } + + static void wavelet_denoise_xtrans(const float *const restrict in, float *const restrict out, diff --git a/graphics/dblatex/dblatex.SlackBuild b/graphics/dblatex/dblatex.SlackBuild index a178b128d4..60e0298976 100644 --- a/graphics/dblatex/dblatex.SlackBuild +++ b/graphics/dblatex/dblatex.SlackBuild @@ -59,6 +59,9 @@ 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/patches/replace-imp-by-importlib.patch +patch -p1 < $CWD/patches/footmisx.patch + PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') export PYTHONPATH=/opt/python$PYVER/site-packages diff --git a/graphics/dblatex/patches/footmisx.patch b/graphics/dblatex/patches/footmisx.patch new file mode 100644 index 0000000000..1aaedbdcbf --- /dev/null +++ b/graphics/dblatex/patches/footmisx.patch @@ -0,0 +1,82 @@ +--- a/latex/contrib/db2latex/db2latex.sty 2020-11-29 11:50:08.000000000 -0600 ++++ b/latex/contrib/db2latex/db2latex.sty 2025-04-05 22:37:31.424293549 -0500 +@@ -17,7 +17,7 @@ + % Needed packages + \usepackage{ifthen} + \usepackage{float} +-\usepackage{footmisc} ++\usepackage{footmisx} + \usepackage{appendix} + + % Workaround to avoid troubles with accents in \appendixname used as hyperref +--- a/latex/misc/ragged2e.sty 2020-11-29 11:50:08.000000000 -0600 ++++ b/latex/misc/ragged2e.sty 2025-04-05 22:38:29.806140363 -0500 +@@ -72,7 +72,7 @@ + %% \fi + \newif\if@raggedtwoe@originalcommands + \newif\if@raggedtwoe@originalparameters +-\newif\if@raggedtwoe@footmisc ++\newif\if@raggedtwoe@footmisx + \DeclareOption{OriginalCommands}{\@raggedtwoe@originalcommandstrue} + \DeclareOption{originalcommands}{\@raggedtwoe@originalcommandstrue} + \DeclareOption{NewCommands}{\@raggedtwoe@originalcommandsfalse} +@@ -114,8 +114,8 @@ + } + \DeclareOption{raggedrightboxes}{\@raggedtwoe@raggedrightboxes@opt} + \DeclareOption{footnotes}{% +- \@raggedtwoe@footmisctrue +- \PassOptionsToPackage{ragged}{footmisc}% ++ \@raggedtwoe@footmisxtrue ++ \PassOptionsToPackage{ragged}{footmisx}% + } + \newcommand{\@raggedtwoe@abdhook}{% + \PackageInfo{ragged2e}{ABD: executing \string\RaggedRight}% +@@ -126,13 +126,13 @@ + \newcommand{\@raggedtwoe@document@opt}{% + \AtBeginDocument{\@raggedtwoe@abdhook}% + \@raggedtwoe@raggedrightboxes@opt +- \@raggedtwoe@footmisctrue ++ \@raggedtwoe@footmisxtrue + \let\@raggedtwoe@document@opt\relax + } + \DeclareOption{document}{\@raggedtwoe@document@opt} + \DeclareOption*{% +- \if@raggedtwoe@footmisc +- \PassOptionsToPackage{\CurrentOption}{footmisc}% ++ \if@raggedtwoe@footmisx ++ \PassOptionsToPackage{\CurrentOption}{footmisx}% + \else + \OptionNotUsed + \fi +@@ -141,8 +141,8 @@ + \ExecuteOptions{originalcommands,newparameters} + \ProcessOptions\relax + \RequirePackage{everysel} +-\if@raggedtwoe@footmisc +- \AtEndOfPackage{\RequirePackage{footmisc}[2002/08/28]} ++\if@raggedtwoe@footmisx ++ \AtEndOfPackage{\RequirePackage{footmisx}[2002/08/28]} + \fi + \newlength{\CenteringLeftskip} + \newlength{\RaggedLeftLeftskip} +--- a/latex/style/dbk_core.sty 2020-11-29 11:50:08.000000000 -0600 ++++ b/latex/style/dbk_core.sty 2025-04-05 22:39:26.150027210 -0500 +@@ -5,7 +5,7 @@ + \usepackage{ifthen} + \usepackage{subfigure} + \usepackage{enumitem} +-\usepackage{footmisc} ++\usepackage{footmisx} + \usepackage{appendix} + + % Workaround to avoid troubles with accents in \appendixname used as hyperref +--- a/latex/style/docbook.sty 2020-11-29 11:50:08.000000000 -0600 ++++ b/latex/style/docbook.sty 2025-04-05 22:40:15.334059728 -0500 +@@ -137,7 +137,7 @@ + \usepackage{ifthen} + \usepackage{tabularx} + % Before hyperlink to have consistent links to footnotes +-\usepackage{footmisc} ++\usepackage{footmisx} + % To be able to have sections afters appendices + \usepackage{appendix} diff --git a/graphics/dblatex/patches/replace-imp-by-importlib.patch b/graphics/dblatex/patches/replace-imp-by-importlib.patch new file mode 100644 index 0000000000..0531733c7f --- /dev/null +++ b/graphics/dblatex/patches/replace-imp-by-importlib.patch @@ -0,0 +1,113 @@ +diff --git a/lib/dbtexmf/core/dbtex.py b/lib/dbtexmf/core/dbtex.py +index b3ec732..adac781 100644 +--- a/lib/dbtexmf/core/dbtex.py ++++ b/lib/dbtexmf/core/dbtex.py +@@ -15,7 +15,7 @@ try: + except ImportError: + from urllib.request import pathname2url + import glob +-import imp ++import importlib + from optparse import OptionParser + from io import open + +@@ -540,15 +540,14 @@ class DbTexCommand: + + def load_plugin(self, pathname): + moddir, modname = os.path.split(pathname) +- try: +- filemod, path, descr = imp.find_module(modname, [moddir]) +- except ImportError: +- try: +- filemod, path, descr = imp.find_module(modname) +- except ImportError: +- failed_exit("Error: '%s' module not found" % modname) +- mod = imp.load_module(modname, filemod, path, descr) +- filemod.close() ++ spec = importlib.machinery.PathFinder.find_spec(modname, [moddir]) ++ if not spec: ++ spec = importlib.machinery.PathFinder.find_spec(modname) ++ if not spec: ++ failed_exit("Error: '%s' module not found" % modname) ++ mod = importlib.util.module_from_spec(spec) ++ spec.loader.exec_module(mod) ++ sys.modules[modname] = mod + return mod + + def run_setup(self, options): +diff --git a/lib/dbtexmf/dblatex/grubber/plugins.py b/lib/dbtexmf/dblatex/grubber/plugins.py +index 9e333c9..047f2bb 100644 +--- a/lib/dbtexmf/dblatex/grubber/plugins.py ++++ b/lib/dbtexmf/dblatex/grubber/plugins.py +@@ -4,7 +4,7 @@ + Mechanisms to dynamically load extra modules to help the LaTeX compilation. + All the modules must be derived from the TexModule class. + """ +-import imp ++import importlib + + from os.path import * + from dbtexmf.dblatex.grubber.msg import _, msg +@@ -108,17 +108,16 @@ class Plugins (object): + """ + if name in self.modules: + return 2 +- try: +- file, path, descr = imp.find_module(name, [""]) +- except ImportError: ++ spec = importlib.machinery.PathFinder.find_spec(name, [""]) ++ if not spec: + if not self.path: + return 0 +- try: +- file, path, descr = imp.find_module(name, self.path) +- except ImportError: +- return 0 +- module = imp.load_module(name, file, path, descr) +- file.close() ++ spec = importlib.machinery.PathFinder.find_spec(name, self.path) ++ if not spec: ++ return 0 ++ module = importlib.util.module_from_spec(spec) ++ spec.loader.exec_module(module) ++ sys.modules[name] = module + self.modules[name] = module + return 1 + +diff --git a/lib/dbtexmf/xslt/xslt.py b/lib/dbtexmf/xslt/xslt.py +index 0350e30..57c99a2 100644 +--- a/lib/dbtexmf/xslt/xslt.py ++++ b/lib/dbtexmf/xslt/xslt.py +@@ -2,20 +2,21 @@ + # Very simple plugin loader for Xslt classes + # + import os +-import imp ++import importlib + import glob ++import sys + + def load(modname): +- try: +- file, path, descr = imp.find_module(modname, [""]) +- except ImportError: +- try: +- file, path, descr = imp.find_module(modname, +- [os.path.dirname(__file__)]) +- except ImportError: +- raise ValueError("Xslt '%s' not found" % modname) +- mod = imp.load_module(modname, file, path, descr) +- file.close() ++ spec = importlib.machinery.PathFinder.find_spec(modname, [""]) ++ if not spec: ++ spec = importlib.machinery.PathFinder.find_spec(modname, ++ [os.path.dirname(__file__)]) ++ if not spec: ++ raise ValueError("Xslt '%s' not found" % modname) ++ ++ mod = importlib.util.module_from_spec(spec) ++ spec.loader.exec_module(mod) ++ sys.modules[modname] = mod + o = mod.Xslt() + return o + diff --git a/graphics/dia/dia.SlackBuild b/graphics/dia/dia.SlackBuild index 0210679254..6b65ec0514 100644 --- a/graphics/dia/dia.SlackBuild +++ b/graphics/dia/dia.SlackBuild @@ -19,7 +19,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dia VERSION=${VERSION:-0.97.3} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -31,9 +31,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -64,7 +61,6 @@ 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 . \ @@ -73,9 +69,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Enable HTML documentation, necessary for Help functionality. -patch configure.in < $CWD/dia-enable-html-docs.patch +# Upstream bug #737254 +sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die +# Upstream bug #737255 +sed -i -e "/localedir/d" configure.in || die +for i in $CWD/patches/* ; do patch -p1 < $i ; done autoreconf -fi CFLAGS="$SLKCFLAGS" \ @@ -85,10 +84,12 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-swig \ --with-cairo \ - --with-python \ + --without-python \ + --without-swig \ + --without-hardbooks \ --disable-gnome \ + --disable-libemf \ --disable-static \ --build=$ARCH-slackware-linux diff --git a/graphics/dia/patches/dia-0.97.3-c99.patch b/graphics/dia/patches/dia-0.97.3-c99.patch new file mode 100644 index 0000000000..6ee2cb2df3 --- /dev/null +++ b/graphics/dia/patches/dia-0.97.3-c99.patch @@ -0,0 +1,284 @@ +https://bugs.gentoo.org/883069 +https://src.fedoraproject.org/rpms/dia/raw/rawhide/f/dia-0.97.3-const-ft_vector.patch +https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-g_test_add_data_func_1.patch +https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-g_test_add_data_func_2.patch +https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-get_data_size.patch + +From e5557aa1d396bc3ca80240f7b5c0a1831a5cf209 Mon Sep 17 00:00:00 2001 +From: Hans Breuer +Date: Sat, 4 May 2013 15:20:15 +0200 +Subject: [PATCH] [warningectomy] initialization from incompatible pointer type + +FT_Outline_Funcs take const FT_Vector* nowadays. +--- a/plug-ins/postscript/diapsft2renderer.c ++++ b/plug-ins/postscript/diapsft2renderer.c +@@ -61,16 +61,16 @@ void draw_bezier_outline(DiaPsRenderer *renderer, + double pos_y + ); + /* Countour traveling functions */ +-static int paps_move_to( FT_Vector* to, ++static int paps_move_to( const FT_Vector* to, + void *user_data); +-static int paps_line_to( FT_Vector* to, ++static int paps_line_to( const FT_Vector* to, + void *user_data); +-static int paps_conic_to( FT_Vector* control, +- FT_Vector* to, ++static int paps_conic_to( const FT_Vector* control, ++ const FT_Vector* to, + void *user_data); +-static int paps_cubic_to( FT_Vector* control1, +- FT_Vector* control2, +- FT_Vector* to, ++static int paps_cubic_to( const FT_Vector* control1, ++ const FT_Vector* control2, ++ const FT_Vector* to, + void *user_data); + + static void dia_ps_ft2_renderer_class_init (DiaPsFt2RendererClass *klass); +@@ -111,7 +111,7 @@ set_font(DiaRenderer *self, DiaFont *font, real height) + /*====================================================================== + outline traversing functions. + ----------------------------------------------------------------------*/ +-static int paps_move_to( FT_Vector* to, ++static int paps_move_to( const FT_Vector* to, + void *user_data) + { + OutlineInfo *outline_info = (OutlineInfo*)user_data; +@@ -121,7 +121,7 @@ static int paps_move_to( FT_Vector* to, + return 0; + } + +-static int paps_line_to( FT_Vector* to, ++static int paps_line_to( const FT_Vector* to, + void *user_data) + { + OutlineInfo *outline_info = (OutlineInfo*)user_data; +@@ -131,8 +131,8 @@ static int paps_line_to( FT_Vector* to, + return 0; + } + +-static int paps_conic_to( FT_Vector* control, +- FT_Vector* to, ++static int paps_conic_to( const FT_Vector* control, ++ const FT_Vector* to, + void *user_data) + { + OutlineInfo *outline_info = (OutlineInfo*)user_data; +@@ -144,9 +144,9 @@ static int paps_conic_to( FT_Vector* control, + return 0; + } + +-static int paps_cubic_to( FT_Vector* control1, +- FT_Vector* control2, +- FT_Vector* to, ++static int paps_cubic_to( const FT_Vector* control1, ++ const FT_Vector* control2, ++ const FT_Vector* to, + void *user_data) + { + OutlineInfo *outline_info = (OutlineInfo*)user_data; +-- +GitLab + +From caddfcab250fe677ecf294fad835b71e6b10cf26 Mon Sep 17 00:00:00 2001 +From: Hans Breuer +Date: Fri, 3 Oct 2014 22:26:36 +0200 +Subject: [PATCH] [warningectomy] incompatible pointer types passing ... + +test-boundingbox.c:152:58: warning: incompatible pointer types passing 'void (const struct _TestBeziers *)' to parameter of type 'GTestDataFunc' (aka 'void (*)(gconstpointer)') [-Wincompatible-pointer-types] + g_test_add_data_func (testpath, &_test_beziers[i], _check_one_bezier); + ^~~~~~~~~~~~~~~~~ +test-svg.c:117:55: warning: incompatible pointer types passing 'void (const PathData *)' to parameter of type 'GTestDataFunc' (aka 'void (*)(gconstpointer)') [-Wincompatible-pointer-types] + g_test_add_data_func (testpath, &_test_path[i], _check_one_path); + ^~~~~~~~~~~~~~~ +--- a/tests/test-boundingbox.c ++++ b/tests/test-boundingbox.c +@@ -132,8 +132,9 @@ static struct _TestBeziers { + #undef BEZ + + static void +-_check_one_bezier (const struct _TestBeziers *test) ++_check_one_bezier (gconstpointer p) + { ++ const struct _TestBeziers *test = p; + Rectangle rect; + PolyBBExtras extra = {0, T*.7, T*.7, T*.7, 0 }; + +Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/9c481f649414190bf8d6741cbca1777e9766756b + +--- a/tests/test-objects.c ++++ b/tests/test-objects.c.g_test_add_data_func_2 +@@ -39,8 +39,9 @@ + int num_objects = 0; + + static void +-_test_creation (const DiaObjectType *type) ++_test_creation (gconstpointer user_data) + { ++ const DiaObjectType *type = (const DiaObjectType *)user_data; + int i; + Handle *h1 = NULL, *h2 = NULL; + Point point = {0, 0}; +@@ -112,8 +113,9 @@ + } + + static void +-_test_copy (const DiaObjectType *type) ++_test_copy (gconstpointer user_data) + { ++ const DiaObjectType *type = (const DiaObjectType *)user_data; + Handle *h1 = NULL, *h2 = NULL; + Point from = {0, 0}; + DiaObject *oc, *o = type->ops->create (&from, type->default_user_data, &h1, &h2); +@@ -172,8 +174,9 @@ + } + + static void +-_test_movement (const DiaObjectType *type) ++_test_movement (gconstpointer user_data) + { ++ const DiaObjectType *type = (const DiaObjectType *)user_data; + Handle *h1 = NULL, *h2 = NULL; + Point from = {0, 0}; + DiaObject *o = type->ops->create (&from, type->default_user_data, &h1, &h2); +@@ -215,8 +218,9 @@ + } + + static void +-_test_change (const DiaObjectType *type) ++_test_change (gconstpointer user_data) + { ++ const DiaObjectType *type = (const DiaObjectType *)user_data; + Handle *h1 = NULL, *h2 = NULL; + Point from = {0, 0}; + DiaObject *o = type->ops->create (&from, type->default_user_data, &h1, &h2); + +Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/f57ea2685034ddbafc19f35d9b525a12283d7c24 + +--- a/lib/prop_geomtypes.c ++++ b/lib/prop_geomtypes.c.get_data_size +@@ -129,9 +129,10 @@ + } + + static int +-realprop_get_data_size(RealProperty *prop) ++realprop_get_data_size(void) + { +- return sizeof (prop->real_data); ++ RealProperty prop; ++ return sizeof (prop.real_data); + } + + static const PropertyOps realprop_ops = { +@@ -242,9 +243,10 @@ + } + + static int +-lengthprop_get_data_size(LengthProperty *prop) ++lengthprop_get_data_size(void) + { +- return sizeof (prop->length_data); ++ LengthProperty prop; ++ return sizeof (prop.length_data); + } + + static const PropertyOps lengthprop_ops = { +@@ -358,9 +360,10 @@ + } + + static int +-fontsizeprop_get_data_size(FontsizeProperty *prop) ++fontsizeprop_get_data_size(void) + { +- return sizeof (prop->fontsize_data); ++ FontsizeProperty prop; ++ return sizeof (prop.fontsize_data); + } + + static const PropertyOps fontsizeprop_ops = { +--- a/lib/prop_inttypes.c ++++ b/lib/prop_inttypes.c.get_data_size +@@ -122,9 +122,10 @@ + } + + static int +-charprop_get_data_size(CharProperty *prop) ++charprop_get_data_size(void) + { +- return sizeof (prop->char_data); ++ CharProperty prop; ++ return sizeof (prop.char_data); + } + + +@@ -229,9 +230,10 @@ + } + + static int +-boolprop_get_data_size(BoolProperty *prop) ++boolprop_get_data_size(void) + { +- return sizeof (prop->bool_data); ++ BoolProperty prop; ++ return sizeof (prop.bool_data); + } + + +@@ -339,9 +341,10 @@ + } + + static int +-intprop_get_data_size(IntProperty *prop) ++intprop_get_data_size(void) + { +- return sizeof (prop->int_data); ++ IntProperty prop; ++ return sizeof (prop.int_data); + } + + static const PropertyOps intprop_ops = { +--- a/lib/prop_text.c ++++ b/lib/prop_text.c.get_data_size +@@ -208,9 +208,10 @@ + } + + static int +-stringprop_get_data_size(StringProperty *prop) ++stringprop_get_data_size(void) + { +- return sizeof (prop->string_data); /* only the pointer */ ++ StringProperty prop; ++ return sizeof (prop.string_data); /* only the pointer */ + } + + static StringListProperty * +--- a/lib/properties.h ++++ b/lib/properties.h.get_data_size +@@ -116,7 +116,7 @@ + void *base, guint offset, guint offset2); + typedef void (*PropertyType_SetFromOffset)(Property *prop, + void *base, guint offset, guint offset2); +-typedef int (*PropertyType_GetDataSize)(Property *prop); ++typedef int (*PropertyType_GetDataSize)(void); + + + struct _PropertyOps { +--- a/objects/custom/custom_object.c ++++ b/objects/custom/custom_object.c.get_data_size +@@ -372,14 +372,7 @@ + info->prop_offsets[i].name = info->props[i].name; + info->prop_offsets[i].type = info->props[i].type; + info->prop_offsets[i].offset = offs; +- /* FIXME: +- custom_object.c:328: warning: passing arg 1 of pointer to function +- from incompatible pointer type +- We don't have a Property* here so there is not much we can do about. +- Maybe it even works cause the sizeof() in *_get_data_size can be +- calculated at compile time. Anyway, a mess ;) --hb +- */ +- size = info->props[i].ops->get_data_size (&info->props[i]); ++ size = info->props[i].ops->get_data_size (); + info->ext_attr_size += size; + offs += size; + } diff --git a/graphics/dia/patches/dia-0.97.3-configure-clang16.patch b/graphics/dia/patches/dia-0.97.3-configure-clang16.patch new file mode 100644 index 0000000000..0cf797a4ad --- /dev/null +++ b/graphics/dia/patches/dia-0.97.3-configure-clang16.patch @@ -0,0 +1,56 @@ +https://bugs.gentoo.org/874729 +https://src.fedoraproject.org/rpms/dia/blob/0a14169fc36b959598074065678e0126830317f8/f/dia-configure-c99.patch + +C99 removes support for implicit ints, so declare the return type +of main explicitly. Future compilers are likely to require explicit +type declarations. + +Upstream has switched to Meson, and it does not seem to use this +particular check anymore. + +https://bugs.gentoo.org/651522 +Remove the insane check for isinf(), since every sane compiler nowadays supports it. + +--- a/configure.in ++++ b/configure.in +@@ -183,7 +183,7 @@ + png_structp pp; + png_infop info; + png_colorp cmap; +- main() { void*foo = png_create_read_struct; }], ++ int main(void) { void*foo = png_create_read_struct; }], + png_ok=yes, + png_ok=no) + LDFLAGS="${old_LDFLAGS}" +@@ -378,28 +378,9 @@ + + dnl Platform-specific fixes. + dnl +- +-dnl Sun Forte C provides isinf() in the unbundled -lsunmath. Solaris +-dnl declares finite() in ieeefp.h. It's preferrable not to link +-dnl to -lsunmath as it's not present on all machines. +-have_isinf=no +-AC_CHECK_HEADERS(math.h, +- AC_CHECK_LIB(m,isinf, +- have_isinf=yes)) +- +-if test "$have_isinf" = "no"; then +- AC_CHECK_HEADER(ieeefp.h, +- [AC_CHECK_FUNC(finite, +- AC_DEFINE(HAVE_IEEEFP_H,1, +- [Define if finite() is defined in ieeefp.h]), +- AC_MSG_ERROR([Can't find a definition of neither +- finite nor isinf]))], +- [AC_MSG_ERROR(Can't find neither a definition of +- isinf nor ieeefp.h)]) +-else +- AC_DEFINE([HAVE_ISINF], 1, +- [Define if the isinf() function is available]) +-fi ++dnl every modern compiler supports C99's isinf() ++AC_DEFINE([HAVE_ISINF], 1, ++ [Define if the isinf() function is available]) + + dnl Alpha needs -mieee or we get a segfault + dnl This shouldn't be needed but is here until a real solution is found diff --git a/graphics/dia/patches/dia-0.97.3-freetype_pkgconfig.patch b/graphics/dia/patches/dia-0.97.3-freetype_pkgconfig.patch new file mode 100644 index 0000000000..c48b5ba66f --- /dev/null +++ b/graphics/dia/patches/dia-0.97.3-freetype_pkgconfig.patch @@ -0,0 +1,66 @@ +--- dia-0.97.3/configure.in ++++ dia-0.97.3/configure.in +@@ -62,43 +62,26 @@ + + AC_ARG_WITH(freetype, + [ --without-freetype compile without FreeType support],,with_freetype=yes) +-if test "x$with_freetype" = "xyes"; then +-PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false) +-if test "$have_pangoft2" = "true"; then +- dnl On Solaris with Forte C, at least, need to link app/dia with -lfreetype. +- dnl It's not enough that -lpangoft2 implicitly pulls it in. +- have_freetype=false +- AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=true,have_freetype=false,`freetype-config --libs`) +- if test "$have_freetype" = "true"; then +- dnl Need 2.0.9, as a bug was fixed for us there. +- dnl However, freetype-config doesn't give a meaningful version, so we must +- dnl do it like this. +- AC_MSG_CHECKING([if FreeType version is 2.0.9 or higher]) +- old_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS `freetype-config --cflags`" +- AC_TRY_CPP([#include +-#include FT_FREETYPE_H +-#if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 2000009 +-#error Freetype version too low. +-#endif +-], +- [AC_MSG_RESULT(yes) +- FREETYPE_LIBS=`freetype-config --libs` +- AC_SUBST(FREETYPE_LIBS) +- FREETYPE_CFLAGS=`freetype-config --cflags` +- AC_SUBST(FREETYPE_CFLAGS) +- GTK_MODULES="$GTK_MODULES pangoft2" +- AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])] +- , +- [AC_MSG_ERROR([Need FreeType library version 2.0.9 or higher])]) +- CPPFLAGS="$old_CPPFLAGS" +- else +- AC_MSG_ERROR(Can't find FreeType library) +- fi +-else +- AC_MSG_ERROR(Can't find PangoFT2 library) +-fi +-fi ++AS_IF([test "x$with_freetype" = "xyes"],[ ++ dnl freetype2.pc uses the libtool specific version number and not the ++ dnl package version. See ++ dnl https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT ++ dnl Let's raise minimum dependency to freetype-2.4.0 because that's the ++ dnl lowest freetype libtool version I could find. ++ dnl freetype-2.4.0 is from July 2010 and should be reasonably old ++ dnl enough. ++ PKG_CHECK_MODULES(FREETYPE, freetype2 >= 11.0.5, ++ [ ++ CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" ++ AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library]) ++ ], ++ AC_MSG_ERROR([Need FreeType library version 2.4.0 or higher]) ++ ) ++ PKG_CHECK_MODULES(PANGOFT2,pangoft2, ++ GTK_MODULES="$GTK_MODULES pangoft2", ++ AC_MSG_ERROR(Can't find PangoFT2 library) ++ ) ++]) + AM_CONDITIONAL(WITH_FREETYPE, test "x$with_freetype" != "xno") + + CFLAGS="$FREETYPE_CFLAGS $CFLAGS" diff --git a/graphics/dia/dia-enable-html-docs.patch b/graphics/dia/patches/dia-enable-html-docs.patch similarity index 100% rename from graphics/dia/dia-enable-html-docs.patch rename to graphics/dia/patches/dia-enable-html-docs.patch diff --git a/graphics/djview4/djview4.SlackBuild b/graphics/djview4/djview4.SlackBuild index ef2c76e027..1e17d62e23 100644 --- a/graphics/djview4/djview4.SlackBuild +++ b/graphics/djview4/djview4.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=djview4 -VERSION=${VERSION:-4.10.6} +VERSION=${VERSION:-4.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -75,7 +75,6 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/djview-$VERSION.tar.gz -mv djview-$VERSION djview4-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -84,10 +83,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -if [ "$QTDIR" == "/opt/kde3/lib/qt3" ]; then - QTDIR=$QT4DIR -fi +for i in $CWD/patches/* ; do patch -p1 < $i ; done + +autoreconf -fi +QMAKE=/usr/bin/qmake-qt5 \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/djview4/djview4.info b/graphics/djview4/djview4.info index 0352ccd371..57c567b276 100644 --- a/graphics/djview4/djview4.info +++ b/graphics/djview4/djview4.info @@ -1,8 +1,8 @@ PRGNAM="djview4" -VERSION="4.10.6" +VERSION="4.12" HOMEPAGE="http://djvu.sourceforge.net/djview4.html" -DOWNLOAD="https://sourceforge.net/projects/djvu/files/DjView/4.10/djview-4.10.6.tar.gz" -MD5SUM="f23205e9d04e4ee4c2324e1d0bae1d1f" +DOWNLOAD="https://downloads.sourceforge.net/djvu/djview-4.12.tar.gz" +MD5SUM="a91328d0fc949a97931511dcd983236b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/djview4/patches/0001-cross-build-pkg-config-info.patch b/graphics/djview4/patches/0001-cross-build-pkg-config-info.patch new file mode 100644 index 0000000000..2f2f46ea2c --- /dev/null +++ b/graphics/djview4/patches/0001-cross-build-pkg-config-info.patch @@ -0,0 +1,86 @@ +From: Helmut Grohne +Date: Thu, 4 Jan 2018 08:48:09 +0100 +Subject: cross build pkg-config info + +Issue: djview4 FTCBFS: uses custom, broken macro AC_PROG_PKG_CONFIG +See: https://bugs.debian.org/886304 + +djview4 fails to cross build from source, because it uses the build +architecture pkg-config rather than the host architecture one. This is +due to its use of AC_PROG_PKG_CONFIG, which fails to consider +$ac_tool_prefix. After replacing the macro with the upstream macro +PKG_PROG_PKG_CONFIG (from pkg.m4 in pkg-config), the build continues a +bit further and uses the wrong qmake. I need to discuss the qmake issue +with the qt people. Can you apply the attached patch anyway and close +this bug report when doing so? That'd make the qmake failure immediately +visible and thus easier to discuss. +--- + config/acinclude.m4 | 26 ++------------------------ + configure.ac | 3 ++- + 2 files changed, 4 insertions(+), 25 deletions(-) + +diff --git a/config/acinclude.m4 b/config/acinclude.m4 +index 3c78d41..2912000 100644 +--- a/config/acinclude.m4 ++++ b/config/acinclude.m4 +@@ -168,28 +168,6 @@ TIFFOpen(0,0); + + + +- +-dnl ------------------------------------------------------------------ +-dnl @synopsis AC_PROG_PKG_CONFIG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +-dnl Sets output variables PKG_CONFIG +-dnl ------------------------------------------------------------------ +- +- +-AC_DEFUN([AC_PROG_PKG_CONFIG], +-[ +- AC_ARG_VAR(PKG_CONFIG,[Location of the pkg-config program.]) +- AC_ARG_VAR(PKG_CONFIG_PATH, [Path for pkg-config descriptors.]) +- AC_PATH_PROG(PKG_CONFIG, pkg-config) +- if test -z "$PKG_CONFIG" ; then +- ifelse([$2],,:,[$2]) +- else +- ifelse([$1],,:,[$1]) +- fi +-]) +- +- +- +- + dnl ------------------------------------------------------------------ + dnl @synopsis AC_PATH_DDJVUUAPI([action-if-found],[action-if-notfound]) + dnl Search for ddjvuapi. Defines HAVE_DDJVUAPI. +@@ -198,7 +176,7 @@ dnl ------------------------------------------------------------------ + + AC_DEFUN([AC_PATH_DDJVUAPI], + [ +- AC_REQUIRE([AC_PROG_PKG_CONFIG]) ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_VAR(DDJVUAPI_LIBS, [Libraries for ddjvuapi]) + AC_ARG_VAR(DDJVUAPI_CFLAGS, [Compilation flags for ddjvuapi]) + AC_MSG_CHECKING([for ddjvuapi]) +@@ -236,7 +214,7 @@ dnl ------------------------------------------------------------------ + + AC_DEFUN([AC_PATH_GLIB], + [ +- AC_REQUIRE([AC_PROG_PKG_CONFIG]) ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_VAR(GLIB_LIBS, [Libraries for glib-2.0]) + AC_ARG_VAR(GLIB_CFLAGS, [Compilation flags for glib-2.0]) + AC_MSG_CHECKING([for glib]) +diff --git a/configure.ac b/configure.ac +index 473a456..e93aee8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -172,7 +172,8 @@ AC_CHECK_FUNCS(sigaction strerror waitpid wait3) + # Packages + # ---------------------------------------- + +-AC_PROG_PKG_CONFIG([],[ ++PKG_PROG_PKG_CONFIG ++AS_IF([test -z "$PKG_CONFIG"],[ + AC_MSG_ERROR([Cannot find required program pkg-config.]) + ]) + diff --git a/graphics/djview4/patches/0002-debian-changes.patch b/graphics/djview4/patches/0002-debian-changes.patch new file mode 100644 index 0000000000..059ede331b --- /dev/null +++ b/graphics/djview4/patches/0002-debian-changes.patch @@ -0,0 +1,3606 @@ +This is an autogenerated patch header for a single-debian-patch file. The +delta against upstream is either kept as a single patch, or maintained +in some VCS, and exported as a single patch instead of more manageable +atomic patches. + +--- djview4-4.12.orig/README_translations ++++ djview4-4.12/README_translations +@@ -49,11 +49,12 @@ CONTRIBUTORS + + Translations for djview were contributed by: + +-djview_cs.ts Petr Pisar +-djview_de.ts Marc Feld +-djview_es.ts Mike Molina +-djview_fr.ts Leon Bottou +-djview_ru.ts Alexander Potashev +-djview_uk.ts Yuri Chornoivan +-djview_zh_CN/TW.ts Lee Chenhwa ++djview_cs.ts Petr Pisar ++djview_de.ts Marc Feld ++djview_es.ts Mike Molina ++djview_fr.ts Leon Bottou ++djview_ru.ts Alexander Potashev ++djview_uk.ts Yuri Chornoivan ++djview_pl.ts Janusz S. Bień, Tomasz Świerczek ++djview_zh_CN/TW.ts Lee Chenhwa + +--- djview4-4.12.orig/config/acinclude.m4 ++++ djview4-4.12/config/acinclude.m4 +@@ -272,7 +272,7 @@ Unsetting them is better than setting th + path=$QTDIR/bin:$PATH + fi + if test -z "$QMAKE" ; then +- AC_PATH_PROGS([QMAKE], [qmake], [], [$path]) ++ AC_PATH_TOOL([QMAKE], [qmake], [], [$path]) + fi + if test -z "$QMAKE" ; then + AC_MSG_ERROR([Cannot find the Qt program qmake. +@@ -327,7 +327,7 @@ If you define QMAKESPEC, make sure it is + altrcc="rcc-${qtversion}" + altlupdate="lupdate-${qtversion}" + altlrelease="lrelease-${qtversion}" +- else ++ elif test `basename "$QMAKE"` = qmake ; then + AC_MSG_CHECKING([for real qmake path]) + test -x "$QT_INSTALL_BINS/qmake" && QMAKE="$QT_INSTALL_BINS/qmake" + AC_MSG_RESULT([$QMAKE]) +--- djview4-4.12.orig/mac/make_djview_bundle.sh ++++ djview4-4.12/mac/make_djview_bundle.sh +@@ -79,55 +79,51 @@ run rmdir $bundle/bin || exit + run ln -s ./MacOS $bundle/bin || exit + run ln -s ./MacOS $bundle/plugins || exit + +-# copy needed homebrew libraries +-for lib in $(otool -L $bundle/MacOS/ddjvu | awk '/^\t/{print $1}') ; do +- case "$lib" in +- $BREWDIR/*) +- libname=$(basename "$lib") +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- esac +-done + + # copy needed qt plugins + ( cd "$QTDIR" ; \ + ls -1 plugins/{platforms,imageformats,styles,printsupport}/*.dylib | \ +- grep -v libqwebgl.dylib | \ +- grep -v _debug.dylib ) | \ ++ grep -v libqwebgl.dylib | \ ++ grep -v libqpdf.dylib | \ ++ grep -v libqsvg.dylib | \ ++ grep -v _debug.dylib ) | \ + while read plugin ; do + run mkdir -p $bundle/$(dirname "$plugin") || exit + run cp "$QTDIR/$plugin" $bundle/"$plugin" || exit + done + +- +- +-# copy needed libraries +-for loader in \ +- $bundle/MacOS/djview \ +- $bundle/MacOS/*/*.dylib +-do +- for lib in $(otool -L $loader | awk '/^\t/{print $1}') ++# copy needed libraries ++function getlibs() { ++ for loader in $* + do +- if [ $(basename "$lib") != $(basename "$loader") ] +- then +- case "$lib" in +- $BREWDIR/*) +- libname=$(basename "$lib") +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- @rpath/*) +- libname=$(basename "$lib") +- lib="$QTDIR/lib${lib/#@rpath//}" +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- $QTDIR/*) +- libname=$(basename "$lib") +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- esac +- fi ++ for lib in $(otool -L $loader | awk '/^\t/{print $1}') ++ do ++ if [ $(basename "$lib") != $(basename "$loader") ] ++ then ++ case "$lib" in ++ $BREWDIR/*) ++ libname=$(basename "$lib") ++ test -r "./$bundle/lib/$libname" || \ ++ run cp "$lib" "./$bundle/lib/$libname" || exit ;; ++ @rpath/*) ++ libname=$(basename "$lib") ++ lib="$QTDIR/lib${lib/#@rpath//}" ++ test -r "./$bundle/lib/$libname" || \ ++ run cp "$lib" "./$bundle/lib/$libname" || exit ;; ++ $QTDIR/*) ++ libname=$(basename "$lib") ++ test -r "./$bundle/lib/$libname" || \ ++ run cp "$lib" "./$bundle/lib/$libname" || exit ;; ++ esac ++ fi ++ done + done +-done ++} ++getlibs $bundle/MacOS/ddjvu ++getlibs $bundle/MacOS/djview ++getlibs $bundle/MacOS/*/*.dylib ++getlibs $bundle/lib/Qt* ++getlibs $bundle/lib/*.dylib + + # copy translations + languages=$(ls -1 ../src/*.qm | sed -e 's/^[^_]*_//' -e 's/\.qm$//') +--- djview4-4.12.orig/mac/make_djview_dmg.sh ++++ djview4-4.12/mac/make_djview_dmg.sh +@@ -1,6 +1,6 @@ + #!/bin/bash + +-dmgname="DjVuLibre-3.5.27+DjView-4.10.6-intel64" ++dmgname="DjVuLibre-3.5.28+DjView-4.12-intel64-3" + + cd $(dirname $0) + if ! test -d DjView.app ; then +--- djview4-4.12.orig/src/djview.am ++++ djview4-4.12/src/djview.am +@@ -57,3 +57,5 @@ qmake_ts += djview_zh_cn.ts + qmake_qm += djview_zh_cn.qm + qmake_ts += djview_zh_tw.ts + qmake_qm += djview_zh_tw.qm ++qmake_ts += djview_pl.ts ++qmake_qm += djview_pl.qm +--- djview4-4.12.orig/src/djview.pro ++++ djview4-4.12/src/djview.pro +@@ -141,3 +141,4 @@ TRANSLATIONS += djview_ru.ts + TRANSLATIONS += djview_es.ts + TRANSLATIONS += djview_zh_cn.ts + TRANSLATIONS += djview_zh_tw.ts ++TRANSLATIONS += djview_pl.ts +--- /dev/null ++++ djview4-4.12/src/djview_pl.ts +@@ -0,0 +1,3389 @@ ++ ++ ++ ++ ++ Generic ++ ++ ++ thisLanguage ++ Name of THIS language ++ Polski ++ ++ ++ ++ QApplication ++ ++ ++ Option '-fix' is deprecated. ++ Opcja '-fix' jest przestarzała. ++ ++ ++ ++ QDjView ++ ++ ++ cannot open '%1'. ++ nie można otworzyć '%1'. ++ ++ ++ ++ FitWidth ++ zoomCombo ++ Dostosuj szerokość strony ++ ++ ++ ++ FitPage ++ zoomCombo ++ Dostosuj wielkość strony ++ ++ ++ ++ Stretch ++ zoomCombo ++ Rozciągnij ++ ++ ++ ++ 1:1 ++ zoomCombo ++ Wiernie (1:1) ++ ++ ++ ++ 300% ++ zoomCombo ++ 300% ++ ++ ++ ++ 200% ++ zoomCombo ++ 200% ++ ++ ++ ++ 150% ++ zoomCombo ++ 150% ++ ++ ++ ++ 100% ++ zoomCombo ++ 100% ++ ++ ++ ++ 75% ++ zoomCombo ++ 75% ++ ++ ++ ++ 50% ++ zoomCombo ++ 50% ++ ++ ++ ++ Color ++ modeCombo ++ Kolor ++ ++ ++ ++ Stencil ++ modeCombo ++ Translation not obvious, may be controversial ++ Maska ++ ++ ++ ++ Foreground ++ modeCombo ++ Loose controversial translation (~print layer) ++ Front ++ ++ ++ ++ Background ++ modeCombo ++ Tło ++ ++ ++ ++ Hidden Text ++ modeCombo ++ Tekst ukryty ++ ++ ++ ++ &New ++ File| ++ &Nowy ++ ++ ++ ++ Ctrl+N ++ File|New ++ Ctrl+N ++ ++ ++ ++ Create a new DjView window. ++ Otwórz nowe okno DjView. ++ ++ ++ ++ &Open ++ File| ++ &Otwórz ++ ++ ++ ++ Ctrl+O ++ File|Open ++ Ctrl-O ++ ++ ++ ++ Open a DjVu document. ++ Otwórz dokument DjVu. ++ ++ ++ ++ Open &Location... ++ File| ++ Otwórz &adres... ++ ++ ++ ++ Open a remote DjVu document. ++ Otwórz zdalny dokument DjVu. ++ ++ ++ ++ &Close ++ File| ++ &Zamknij ++ ++ ++ ++ Ctrl+W ++ File|Close ++ Ctrl+W ++ ++ ++ ++ Close this window. ++ Zamknij to okno. ++ ++ ++ ++ &Quit ++ File| ++ Za&kończ ++ ++ ++ ++ Ctrl+Q ++ File|Quit ++ Ctrl+Q ++ ++ ++ ++ Close all windows and quit the application. ++ Zamknij wszystkie okna i zakończ aplikację. ++ ++ ++ ++ Save &as... ++ File| ++ Zapisz &jako... ++ ++ ++ ++ Ctrl+S ++ File|SaveAs ++ Ctrl+S ++ ++ ++ ++ Save the DjVu document. ++ Zapisz dokument DjVu. ++ ++ ++ ++ &Export as... ++ File| ++ &Eksportuj jako... ++ ++ ++ ++ Ctrl+E ++ File|ExportAs ++ Ctrl+E ++ ++ ++ ++ Export DjVu page or document to other formats. ++ Eksportuj stronę lub cały dokument DjVu do innych formatów. ++ ++ ++ ++ &Print... ++ File| ++ &Drukuj... ++ ++ ++ ++ Ctrl+P ++ File|Print ++ Ctrl+P ++ ++ ++ ++ Print the DjVu document. ++ Drukuj dokument DjVu. ++ ++ ++ ++ &Find... ++ Edit| ++ &Znajdź... ++ ++ ++ ++ Ctrl+F ++ Edit|Find ++ Ctrl+F ++ ++ ++ ++ Find text in the document. ++ Znajdź tekst w dokumencie. ++ ++ ++ ++ Find &Next ++ Edit| ++ Znajdź &następny ++ ++ ++ ++ F3 ++ Edit|Find Next ++ F3 ++ ++ ++ ++ Find next occurrence of search text in the document. ++ Znajdź następne wystąpienie szukanego tekstu w dokumencie. ++ ++ ++ ++ Find &Previous ++ Edit| ++ Znajdź &poprzedni ++ ++ ++ ++ Shift+F3 ++ Edit|Find Previous ++ Shift+F3 ++ ++ ++ ++ Find previous occurrence of search text in the document. ++ Znajdź poprzednie wystąpienie szukanego tekstu w dokumencie. ++ ++ ++ ++ &Select ++ Edit| ++ &Wybierz ++ ++ ++ ++ F2 ++ Edit|Select ++ F2 ++ ++ ++ ++ Select a rectangle in the document. ++ Zaznacz prostokąt w dokumencie. ++ ++ ++ ++ Zoom &In ++ Zoom| ++ &Powiększ ++ ++ ++ ++ Increase the magnification. ++ Zwiększ powiększenie. ++ ++ ++ ++ Zoom &Out ++ Zoom| ++ &Zmniejsz ++ ++ ++ ++ Decrease the magnification. ++ Zmniejsz powiększenie. ++ ++ ++ ++ Fit &Width ++ Zoom| ++ Dostosuj &szerokość strony ++ ++ ++ ++ Set magnification to fit page width. ++ Dostosuj powiększenie do szerokości strony. ++ ++ ++ ++ Fit &Page ++ Zoom| ++ Dostosuj wielość &trony ++ ++ ++ ++ Set magnification to fit page. ++ Dostosuj powiększenie do wielkości strony. ++ ++ ++ ++ One &to one ++ Zoom| ++ Jeden &do jednego ++ ++ ++ ++ Set full resolution magnification. ++ Ustaw powiększenie zgodne z pełną rozdzielczością. ++ ++ ++ ++ &300% ++ Zoom| ++ &300% ++ ++ ++ ++ Magnify 300% ++ Powiększ 300% ++ ++ ++ ++ &200% ++ Zoom| ++ &200% ++ ++ ++ ++ Magnify 20% ++ Powiększ 20% ++ ++ ++ ++ &150% ++ Zoom| ++ &150% ++ ++ ++ ++ Magnify 150% ++ Powiększ 150% ++ ++ ++ ++ &100% ++ Zoom| ++ &100% ++ ++ ++ ++ Magnify 100% ++ Powiększ 100% ++ ++ ++ ++ &75% ++ Zoom| ++ &75% ++ ++ ++ ++ Magnify 75% ++ Powiększ 75% ++ ++ ++ ++ &50% ++ Zoom| ++ &50% ++ ++ ++ ++ Magnify 50% ++ Powiększ 50% ++ ++ ++ ++ &First Page ++ Go| ++ &Pierwsza strona ++ ++ ++ ++ Jump to first document page. ++ Przejdź do pierwszej strony dokumentu. ++ ++ ++ ++ &Next Page ++ Go| ++ &Następna strona ++ ++ ++ ++ Jump to next document page. ++ Przejdź do następnej strony dokumentu. ++ ++ ++ ++ &Previous Page ++ Go| ++ P&oprzednia strona ++ ++ ++ ++ Jump to previous document page. ++ Przejdź do poprzedniej strony dokumentu. ++ ++ ++ ++ &Last Page ++ Go| ++ &Ostatnia strona ++ ++ ++ ++ Jump to last document page. ++ Przejdź do ostatniej strony dokumentu. ++ ++ ++ ++ &Backward ++ Go| ++ &Wstecz ++ ++ ++ ++ Backward in history. ++ Cofnij się w historii. ++ ++ ++ ++ &Forward ++ Go| ++ &Naprzód ++ ++ ++ ++ Forward in history. ++ Przejdź do przodu w historii. ++ ++ ++ ++ Rotate &Left ++ Rotate| ++ Obróć w &lewo ++ ++ ++ ++ Rotate page image counter-clockwise. ++ Obróć obraz strony w kierunku przeciwnym do ruchu wskazówek zegara. ++ ++ ++ ++ Rotate &Right ++ Rotate| ++ Obróć w &prawo ++ ++ ++ ++ Rotate page image clockwise. ++ Obróć obraz strony w kierunku ruchu wskazówek zegara. ++ ++ ++ ++ Set natural page orientation. ++ Ustaw naturalna orientację strony. ++ ++ ++ ++ Turn page on its left side. ++ Obróć stronę na lewy bok. ++ ++ ++ ++ Turn page upside-down. ++ Obróć stronę do góry nogami. ++ ++ ++ ++ Turn page on its right side. ++ Obróć stronę na prawy bok. ++ ++ ++ ++ &Information... ++ Edit| ++ &Informacje... ++ ++ ++ ++ Ctrl+I ++ Edit|Information ++ Ctrl+I ++ ++ ++ ++ Show information about the document encoding and structure. ++ Pokaż informacje o kodowaniu dokumentu i jego strukturze. ++ ++ ++ ++ &Metadata... ++ Edit| ++ &Metadane... ++ ++ ++ ++ Ctrl+M ++ Edit|Metadata ++ Ctrl+M ++ ++ ++ ++ Show the document and page meta data. ++ Pokaż metadane dokumentu i strony. ++ ++ ++ ++ &About DjView... ++ &O DjView... ++ ++ ++ ++ Show information about this program. ++ Pokaż informacje o tym programie. ++ ++ ++ ++ &Color ++ Display| ++ &Kolor ++ ++ ++ ++ Display everything. ++ Wyświetl wszystkie warstwy. ++ ++ ++ ++ &Stencil ++ Display| ++ &Maska ++ ++ ++ ++ Only display the document bitonal stencil. ++ Wyświetl tylko bitonalną maskę. ++ ++ ++ ++ &Foreground ++ Display| ++ &Front ++ ++ ++ ++ Only display the foreground layer. ++ Wyświetl tylko warstwę frontową. ++ ++ ++ ++ &Background ++ Display| ++ &Tło ++ ++ ++ ++ Only display the background layer. ++ Wyświetl tylko warstwę tła. ++ ++ ++ ++ &Hidden Text ++ Display| ++ &Tekst ukryty ++ ++ ++ ++ Overlay a representation of the hidden text layer. ++ Nałóż na obraz reprezentację tekstu ukrytego. ++ ++ ++ ++ I&nvert Luminance ++ View| ++ &Odwróć luminancję ++ ++ ++ ++ Invert image luminance while preserving hue. ++ Odwróć luminancję obrazu zachowując nasycenie. ++ ++ ++ ++ Prefere&nces... ++ Settings| ++ &Ustawienia... ++ ++ ++ ++ Show the preferences dialog. ++ Pokaż dialog ustawień. ++ ++ ++ ++ Show &Sidebar ++ Settings| ++ Pokaż panel &boczny ++ ++ ++ ++ F9 ++ Settings|Show sidebar ++ F9 ++ ++ ++ ++ Alt+Ctrl+S ++ Settings|Show sidebar ++ Alt+Ctrl+S ++ ++ ++ ++ Show/hide the side bar. ++ Pokaż/ukryj panel boczny. ++ ++ ++ ++ Show &Toolbar ++ Settings| ++ Pokaż pasek &narzędzi ++ ++ ++ ++ F10 ++ Settings|Show toolbar ++ F10 ++ ++ ++ ++ Alt+Ctrl+T ++ Settings|Show toolbar ++ Alt+Ctrl+T ++ ++ ++ ++ Show/hide the standard tool bar. ++ Pokaż/ukryj standardowy pasek narzędzi. ++ ++ ++ ++ Show Stat&usbar ++ Settings| ++ Pokaż pasek &stanu ++ ++ ++ ++ Show/hide the status bar. ++ Pokaż/ukryj pasek stanu. ++ ++ ++ ++ Alt+Ctrl+/ ++ Settings|Show toolbar ++ Alt+Ctrl+/ ++ ++ ++ ++ &Full Screen ++ View| ++ &Pełny ekran ++ ++ ++ ++ F11 ++ View|FullScreen ++ F11 ++ ++ ++ ++ Meta+Ctrl+F ++ View|FullScreen ++ Meta+Ctrl+F ++ ++ ++ ++ Toggle full screen mode. ++ Włącz lub wyłącz tryb pełnoekranowy. ++ ++ ++ ++ &Slide Show ++ View| ++ &Pokaz slajdów ++ ++ ++ ++ Shift+F11 ++ View|Slideshow ++ Shift+F11 ++ ++ ++ ++ Shift+Ctrl+F ++ Settings|Show toolbar ++ Shift+Ctrl+F ++ ++ ++ ++ Toggle slide show mode. ++ Włącz lub wyłącz tryb pokazu slajdów. ++ ++ ++ ++ &Continuous ++ Layout| ++ Wyświetlanie &ciągłe ++ ++ ++ ++ F4 ++ Layout|Continuous ++ F4 ++ ++ ++ ++ Toggle continuous layout mode. ++ Włącz lub wyłącz tryb wyświetlania ciągłego. ++ ++ ++ ++ Side &by Side ++ Layout| ++ &Dwie strony obok siebie ++ ++ ++ ++ F5 ++ Layout|SideBySide ++ F5 ++ ++ ++ ++ Toggle side-by-side layout mode. ++ Włącz lub wyłącz wyświetlanie dwóch stron obok siebie. ++ ++ ++ ++ Co&ver Page ++ Layout| ++ Strona &tytułowa ++ ++ ++ ++ F6 ++ Layout|CoverPage ++ F6 ++ ++ ++ ++ Show the cover page alone in side-by-side mode. ++ Pokaż osobno stronę tytułową w trybie wyświetlania stron obok siebie. ++ ++ ++ ++ &Right to Left ++ Layout| ++ Z &prawej do lewej ++ ++ ++ ++ Shift+F6 ++ Layout|RightToLeft ++ Shift+F6 ++ ++ ++ ++ Show pages right-to-left in side-by-side mode. ++ Pokazuj strony od prawej do lewej w trybie obok siebie. ++ ++ ++ ++ Copy &URL ++ Edit| ++ Kopiuj &URL ++ ++ ++ ++ Save an URL for the current page into the clipboard. ++ Skopiuj do schowka URL bieżącej strony. ++ ++ ++ ++ Ctrl+C ++ Edit|CopyURL ++ Ctrl+C ++ ++ ++ ++ Copy &Outline ++ Edit| ++ Kopiuj &zakładki ++ ++ ++ ++ Save the djvused code for the outline into the clipboard. ++ Skopiuj do schowka zakładki w formacie djvused. ++ ++ ++ ++ Copy &Annotations ++ Edit| ++ Kopiuj &adnotacje ++ ++ ++ ++ Save the djvused code for the page annotations into the clipboard. ++ Skopiuj do schowka adnotacje w formacie djvused. ++ ++ ++ ++ &File ++ File| ++ &Plik ++ ++ ++ ++ Open &Recent ++ Otwórz &poprzednie ++ ++ ++ ++ &Edit ++ Edit| ++ &Edytuj ++ ++ ++ ++ &View ++ View| ++ &Widok ++ ++ ++ ++ ++ &Zoom ++ View|Zoom ++ &Skaluj ++ ++ ++ ++ ++ &Rotate ++ View|Rotate ++ &Obróć ++ ++ ++ ++ ++ &Display ++ View|Display ++ &Pokaż ++ ++ ++ ++ ++ &Go ++ Go| ++ &Przejdź ++ ++ ++ ++ &Settings ++ Settings| ++ &Ustawienia ++ ++ ++ ++ &Help ++ Help| ++ &Pomoc ++ ++ ++ ++ Control Left Mouse Button ++ Control i lewy klawisz myszy ++ ++ ++ ++ Right Mouse Button ++ Prawy klawisz myszy ++ ++ ++ ++ <html><b>Selecting a rectangle.</b><br/> Once a rectangular area is selected, a popup menu lets you copy the corresponding text or image. Instead of using this tool, you can also hold %1 and use the Left Mouse Button.</html> ++ <html><b>Zaznaczenie prostokąta.</b><br/>Po zaznaczeniu prostokąta pojawi się menu podręczne pozwalające skopiować odpowiedni tekst lub obraz. Zamiast używać tego sposobu, można również przytrzymać %1 i użyć lewego klawisza myszy.</html> ++ ++ ++ ++ <html><b>Zooming.</b><br/> Choose a zoom level for viewing the document. Zoom level 100% displays the document for a 100 dpi screen. Zoom levels <tt>Fit Page</tt> and <tt>Fit Width</tt> ensure that the full page or the page width fit in the window. </html> ++ <html><b>Skalowanie.</b><br/> Wybierz stopień powiększenia lub zmniejszenia wyświetlanego dokumentu.Wartość 100% jest odpowiednia dla ekranu o rozdzielczości 100dpi. Wartości <tt>Dostosuj do strony</tt> i <tt>Dostosuj do szerokości</tt>gwarantują, że odpowiednio cała strona lub cała szerokość strony zmieszczą się w oknie. </html> ++ ++ ++ ++ <html><b>Rotating the pages.</b><br/> Choose to display pages in portrait or landscape mode. You can also turn them upside down.</html> ++ <html><b>Obracanie strony.</b><br/> Wybór wyświetlania strony w trybie portretowym lub krajobrazowym. Można również obrócić stronę do góry nogami.</html> ++ ++ ++ ++ <html><b>Display mode.</b><br/> DjVu images compose a background layer and a foreground layer using a stencil. The display mode specifies with layers should be displayed.</html> ++ <html><b>Tryb wyświetlania.</b><br/> Obrazy DjVu są tworzone z warstw frontu i tła za pomocą maski. Tryb wyświetlania określa, które warstwy będą wyświetlane.</html> ++ ++ ++ ++ <html><b>Navigating the document.</b><br/> The page selector lets you jump to any page by name and can be activated at any time by pressing Ctrl+G. The navigation buttons jump to the first page, the previous page, the next page, or the last page. </html> ++ <html><b>Nawigacja w dokumencie.</b><br/> Selektor strony pozwala przejść do dowolnej strony i może być aktywowany w dowolnym momencie przez naciśnięcie CTRL+G. Przyciski nawigacyjne powodują przejście do pierwszej, poprzedniej, następnej lub ostatniej strony. </html> ++ ++ ++ ++ <html><b>Document and page information.</b><br> Display a dialog window for viewing encoding information pertaining to the document or to a specific page.</html> ++ <html><b>Informacje o stronie i dokumentacje.</b><br> Pokaż okno dialogowe w celu wyświetlenia informacji o kodowaniu dotyczącej dokumentu lub konkretnej strony.</html> ++ ++ ++ ++ <html><b>Document and page metadata.</b><br> Display a dialog window for viewing metadata pertaining to the document or to a specific page.</html> ++ <html><b>Metadane dokumentu i strony.</b><br> Pokaż okno dialogowe w celu wyświetlenia metadanych dotyczących dokumentu lub konkretnej strony.</html> ++ ++ ++ ++ <html><b>Continuous layout.</b><br/> Display all the document pages arranged vertically inside the scrollable document viewing area.</html> ++ <html><b>Wyświetlanie ciągłe.</b><br/> Wyświetl wszystkie strony dokumentu ustawione pionowe wewnątrz przewijalnego obszaru wyświetlania.</html> ++ ++ ++ ++ <html><b>Side by side layout.</b><br/> Display pairs of pages side by side inside the scrollable document viewing area.</html> ++ <html><b>Wyświetlanie stron obok siebie.</b><br/> Wyświetlaj dwie strony obok siebie wewnątrz przewijalnego obszaru wyświetlania.</html> ++ ++ ++ ++ <html><b>Page information.</b><br/> Display information about the page located under the cursor: the sequential page number, the page size in pixels, and the page resolution in dots per inch. </html> ++ <html><b>Informacja o stronie.</b><br/> Wyświetl informacje o stronie znajdującej się pod kursorem: numer kolejny, rozmiar strony w pikselach i rozdzielczość strony w punktach na cal. </html> ++ ++ ++ ++ <html><b>Cursor information.</b><br/> Display the position of the mouse cursor expressed in page coordinates. </html> ++ <html><b>Informacja o kursorze.</b><br/> Wyświetl pozycję kursora wyrażoną we współrzędnych strony. </html> ++ ++ ++ ++ <html><b>Document viewing area.</b><br/> This is the main display area for the DjVu document. <ul><li>Arrows and page keys to navigate the document.</li><li>Space and BackSpace to read the document.</li><li>Keys <tt>+</tt> <tt>-</tt> <tt>[</tt> <tt>]</tt> to zoom or rotate the document.</li><li>Left Mouse Button for panning and selecting links.</li><li>%3 for displaying the contextual menu.</li><li>%1 Left Mouse Button for selecting text or images.</li><li>%2 for popping the magnification lens.</li></ul></html> ++ <html><b>Obszar wyświetlania dokumentu.</b><br/> To jest główny obszar wyświetlania dokumentu DjVu. <ul><li>Klawisze strzałek i strony nawigują w dokumencie.</li><li>Space i BackSpace przewijają dokument.</li><li>Klawisze <tt>+</tt> <tt>-</tt> <tt>[</tt> <tt>]</tt> skalują lub obracają dokument.</li><li>Lewy klawisz myszy pozycjonuje i wybiera.hiperłącza</li><li>%3 wyświetla menu kontekstowe.</li><li>%1 lewy klawisz myszy wybiera tekst lub obraz.</li><li>%2 uaktywnia lupę.</li></ul></html> ++ ++ ++ ++ <html><b>Document viewing area.</b><br/> This is the main display area for the DjVu document. But you must first open a DjVu document to see anything.</html> ++ <html><b>Obszar wyświetlania dokumentu.</b><br/> To jest główny obszar wyświetlania dokumentu DjVu. Aby cokolwiek zobaczyć trzeba najpierw otworzyć jakiś dokument DjVu.</html> ++ ++ ++ ++ Option '%1' requires boolean argument. ++ Opcja '%1' wymaga argumentu boolowskiego. ++ ++ ++ ++ Illegal value '%2' for option '%1'. ++ Niepoprawna wartość '%2' dla opcji '%1'. ++ ++ ++ ++ Toolbar option '%1' is not implemented. ++ Opcja paska narzędziowego '%1' nie jest zaimplementowana. ++ ++ ++ ++ Toolbar option '%1' is not recognized. ++ Opcja paska narzędzi '%1' nie jest rozpoznana. ++ ++ ++ ++ ++ Option '%1' requires a standalone viewer. ++ Opcja '%1' wymaga samodzielnej przeglądarki. ++ ++ ++ ++ Deprecated option '%1' ++ Przestarzała opcja '%1' ++ ++ ++ ++ Option '%1' is not implemented. ++ Opcja '%1' nie jest zaimplementowana. ++ ++ ++ ++ Option '%1' is not recognized. ++ Opcja '%1' nie jest rozpoznana. ++ ++ ++ ++ ++ DjView ++ DjView ++ ++ ++ ++ Thumbnails ++ Miniaturki ++ ++ ++ ++ Outline ++ Zakładki ++ ++ ++ ++ Find ++ Znajdź ++ ++ ++ ++ Cannot open file '%1'. ++ Nie można otworzyć pliku '%1'. ++ ++ ++ ++ Opening DjVu file ++ Otwieranie pliku DjVu ++ ++ ++ ++ Cannot open URL '%1'. ++ Nie można otworzyć URL '%1'. ++ ++ ++ ++ Opening DjVu document ++ Otwieranie dokumentu DjVu ++ ++ ++ ++ Certificate validation error - DjView ++ dialog caption ++ Błąd weryfikacji certyfikatu - DjView ++ ++ ++ ++ <html> %1 Do you want to continue anyway? </html> ++ <html> %1 Czy chcesz mimo to kontynuować? </html> ++ ++ ++ ++ Cannot find page numbered: %1 ++ Nie można znaleźć strony o numerze: %1 ++ ++ ++ ++ ++ Cannot find page named: %1 ++ Nie można znaleźć strony nazwanej %1 ++ ++ ++ ++ Unrecognized sidebar options '%1'. ++ Nierozpoznana opcja panelu bocznego '%1'. ++ ++ ++ ++ ++ Print - DjView ++ dialog caption ++ Drukuj - DjView ++ ++ ++ ++ <html> This file was served with printing restrictions. Do you want to print it anyway?</html> ++ <html> Ten plik został udostępniony z ograniczeniami drukowania. Czy drukować mimo tego?</html> ++ ++ ++ ++ ++ Save - DjView ++ dialog caption ++ Zapisz - DjView ++ ++ ++ ++ <html> This file was served with saving restrictions. Do you want to save it anyway?</html> ++ <html> Ten plik został udostępniony z ograniczeniami zapisywania. Czy zapisać mimo tego?</html> ++ ++ ++ ++ Export - DjView ++ dialog caption ++ Eksport - DjView ++ ++ ++ ++ Text files ++ save filter ++ Pliki tekstowe ++ ++ ++ ++ ++ All files ++ save filter ++ Wszystkie pliki ++ ++ ++ ++ Save Text - DjView ++ dialog caption ++ Zapisz tekst - DjView ++ ++ ++ ++ ++ ++ Error - DjView ++ dialog caption ++ Błąd - DjView ++ ++ ++ ++ ++ Cannot write file '%1'. ++%2. ++ Nie można zapisać pliku '%1'. ++%2. ++ ++ ++ ++ %1 files (*.%2);; ++ save image filter ++ Translation depends on the numer: 1 plik, 2 pliki, 5 plików,..,101 plik etc. ++ %1 plików (*.%2);; ++ ++ ++ ++ Save Image - DjView ++ dialog caption ++ Zapisz obraz - DjView ++ ++ ++ ++ Cannot determine file format. ++Filename '%1' has no suffix. ++ Nie można rozpoznać formatu pliku. ++Nazwa pliku '%1' nie ma rozszerzenia. ++ ++ ++ ++ Image format %1 not supported. ++ Format obrazu %1 nie jest obsługiwany. ++ ++ ++ ++ Cannot decode page %1. ++ Nie można zdekodować strony %1. ++ ++ ++ ++ Cannot decode document. ++ Nie można zdekodować dokumentu. ++ ++ ++ ++ Decoding DjVu document ++ Dekodowanie dokumentu DjVu ++ ++ ++ ++ P%1/%2 %3x%4 %5dpi ++ P%1/%2 %3x%4 %5dpi ++ ++ ++ ++ x=%1 y=%2 ++ x=%1 y=%2 ++ ++ ++ ++ %3x%4+%1+%2 ++ %3x%4+%1+%2 ++ ++ ++ ++ Go: 1 page forward. ++ Przejdź: 1 strona naprzód. ++ ++ ++ ++ Go: %n pages forward. ++ ++ Przejdź: %n strona naprzód. ++ Przejdź: %n strony naprzód. ++ Przejdź: %n stron naprzód. ++ ++ ++ ++ ++ Go: 1 page backward. ++ Przejdź: 1 strona wstecz. ++ ++ ++ ++ Go: %n pages backward. ++ ++ Przejdź: %n strona wstecz. ++ Przejdź: %n strony wstecz. ++ Przejdź: %n stron wstecz. ++ ++ ++ ++ ++ ++ Go: page %1. ++ Przejdź: strona %1. ++ ++ ++ ++ Go: %1 ++ Przejdź: %1 ++ ++ ++ ++ (in other window.) ++ (w osobnym oknie.) ++ ++ ++ ++ Cannot resolve link '%1' ++ Nie działa hiperłącze '%1' ++ ++ ++ ++ %n characters ++ ++ %n znak ++ %n znaki ++ %n znaków ++ ++ ++ ++ ++ Copy text (%1) ++ Kopiuj tekst (%1) ++ ++ ++ ++ Save text as... ++ Zapisz tekst jako... ++ ++ ++ ++ Copy text into the clipboard. ++ Skopiuj tekst do schowka. ++ ++ ++ ++ Save text into a file. ++ Zapisz tekst w pliku. ++ ++ ++ ++ Copy image (%1x%2 pixels) ++ Kopiuj obraz (%1x%2 piksele) ++ ++ ++ ++ Save image as... ++ Zapisz obraz jako... ++ ++ ++ ++ Copy image into the clipboard. ++ Skopiuj obraz do schowka. ++ ++ ++ ++ Save image into a file. ++ Zapisz obraz w pliku. ++ ++ ++ ++ Zoom to rectangle ++ Powiększ zaznaczenie ++ ++ ++ ++ Zoom the selection to fit the window. ++ Powiększ zaznaczenia na całe okno. ++ ++ ++ ++ Copy URL ++ Kopiuj URL ++ ++ ++ ++ Save into the clipboard an URL that highlights the selection. ++ Zapisz w schowku adres URL który podświetla zaznaczenie. ++ ++ ++ ++ Copy Maparea ++ Kopiuj obszar adnotacji ++ ++ ++ ++ Save into the clipboard a maparea annotation expression for program djvused. ++ Kopiuj do schowka obszar adnotacji w formacie djvused. ++ ++ ++ ++ About DjView ++ O DjView ++ ++ ++ ++ DjVu files ++ Pliki DjVu ++ ++ ++ ++ All files ++ Wszystkie pliki ++ ++ ++ ++ Open - DjView ++ dialog caption ++ Otwórz - DjView ++ ++ ++ ++ Open Location - DjView ++ dialog caption ++ Otwórz adres - DjView ++ ++ ++ ++ Enter the URL of a DjVu document: ++ Wpisz URL dokumentu DjVu: ++ ++ ++ ++ Information - DjView ++ dialog caption ++ Informacje - DjView ++ ++ ++ ++ Metadata - DjView ++ dialog caption ++ Metadane - DjView ++ ++ ++ ++ &Clear History ++ &Wyczyść historię ++ ++ ++ ++ QDjView::NetOpen ++ ++ ++ Cannot open URL '%1'. ++ Nie można otworzyć URL '%1'. ++ ++ ++ ++ Opening DjVu document ++ Otwieranie dokumentu DjVu ++ ++ ++ ++ Cannot spawn a browser for url '%1' ++ Nie można uruchomić przeglądarki dla URL '%1' ++ ++ ++ ++ QDjViewApplication ++ ++ ++ cannot open '%1'. ++ nie można otworzyć '%1'. ++ ++ ++ ++ Usage: djview [options] [filename-or-url] ++Common options include: ++-help~~~Prints this message. ++-verbose~~~Prints all warning messages. ++-display <xdpy>~~~Select the X11 display <xdpy>. ++-geometry <xgeom>~~~Select the initial window geometry. ++-font <xlfd>~~~Select the X11 name of the main font. ++-style <qtstyle>~~~Select the QT user interface style. ++-fullscreen, -fs~~~Start djview in full screen mode. ++-page=<page>~~~Jump to page <page>. ++-zoom=<zoom>~~~Set zoom factor. ++-continuous=<yn>~~~Set continuous layout. ++-sidebyside=<yn>~~~Set side-by-side layout. ++ ++ Are the options really common? ++ Użycie: djview [opcje] [plik-lub-URL] ++Ważniejsze opcje: ++-help~~~Drukuj ten komunikat. ++-verbose~~~Drukuj wszystkie ostrzeżenia. ++-display <xdpy>~~~Wybierz obszar X11 <xdpy>. ++-geometry <xgeom>~~~Wybierz początkową geometrię okna. ++-font <xlfd>~~~Wybierz nazwę X11 głównego fontu. ++-style <qtstyle>~~~Wybierz styl interfejsu QT. ++-fullscreen, -fs~~~Uruchom djview w trybie pełnoekranowym. ++-page=<page>~~~Przejdź do strony <page>. ++-zoom=<zoom>~~~Ustaw wartość skalowania. ++-continuous=<yn>~~~Ustaw wyświetlanie ciągłe. ++-sidebyside=<yn>~~~Ustaw wyświetlanie stron obok siebie. ++ ++ ++ ++ ++ QDjViewAuthDialog ++ ++ ++ Password: ++ Hasło: ++ ++ ++ ++ User: ++ Użytkownik: ++ ++ ++ ++ Authentication required - DjView ++ Wymagane uwierzytelnienie - DjView ++ ++ ++ ++ QDjViewDjVuExporter ++ ++ ++ DjVu Bundled Document ++ Dokument scalony DjVu ++ ++ ++ ++ ++ DjVu Files (*.djvu *.djv) ++ Pliki DjVu (*.djvu *.djv) ++ ++ ++ ++ DjVu Indirect Document ++ Dokument rozłożony DjVu ++ ++ ++ ++ Question - DjView ++ dialog caption ++ Pytanie - DjView ++ ++ ++ ++ <html> This file belongs to a non empty directory. Saving an indirect document creates many files in this directory. Do you want to continue and risk overwriting files in this directory?</html> ++ <html> Ten plik należy do niepustego katalogu.Zapisanie dokumentu rozłożonego stworzy wiele plików w tym katalogu. Czy kontynuować ryzykując zastąpienie plików w tym katalogu?</html> ++ ++ ++ ++ Con&tinue ++ &Kontynuuj ++ ++ ++ ++ &Cancel ++ &Anuluj ++ ++ ++ ++ Unknown error. ++ Nieznany błąd. ++ ++ ++ ++ System error: %1. ++ Błąd systemowy: %1. ++ ++ ++ ++ Save job creation failed! ++ Nie powiodło się utworzenie zadania zapisywania! ++ ++ ++ ++ QDjViewErrorDialog ++ ++ ++ ++ DjView Error ++ Błąd DjView ++ ++ ++ ++ &Ok ++ &OK ++ ++ ++ ++ Error - DjView ++ dialog caption ++ Błąd - DjView ++ ++ ++ ++ QDjViewExportDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ ++ Export ++ Eksport ++ ++ ++ ++ &Document ++ &Dokument ++ ++ ++ ++ C&urrent page ++ &Bieżąca strona ++ ++ ++ ++ &Pages ++ &Strony ++ ++ ++ ++ to ++ do ++ ++ ++ ++ Destination ++ Plik wynikowy ++ ++ ++ ++ Format: ++ Format: ++ ++ ++ ++ &Defaults ++ D&omyślne ++ ++ ++ ++ &Ok ++ &OK ++ ++ ++ ++ ++ &Cancel ++ &Anuluj ++ ++ ++ ++ Stop ++ Stop ++ ++ ++ ++ <html><b>Saving.</b><br/> You can save the whole document or a page range under a variety of formats. Selecting certain formats creates additional dialog pages for specifying format options.</html> ++ <html><b>Zapisywanie.</b><br/> Można zapisać cały dokument lub zakres stron w jednym z kilku formatów. Wybór niektórych formatów otworzy dodatkowe strony dialogowe z parametrami specyficznymi dla danego formatu.</html> ++ ++ ++ ++ Error - DjView ++ dialog caption ++ Błąd - DjView ++ ++ ++ ++ Overwriting the current file is not allowed! ++ Nie można zastąpić bieżącego pliku! ++ ++ ++ ++ Question - DjView ++ dialog caption ++ Pytanie - DjView ++ ++ ++ ++ A file with this name already exists. ++Do you want to replace it? ++ Plik o tej nazwie już istnieje ++Czy go zastąpić? ++ ++ ++ ++ &Replace ++ &Zastąp ++ ++ ++ ++ This operation has failed. ++ Ta operacja nie powiodła się. ++ ++ ++ ++ This operation has been interrupted. ++ Ta operacja została przerwana. ++ ++ ++ ++ All files ++ save filter ++ Wszystkie pliki ++ ++ ++ ++ Export - DjView ++ dialog caption ++ Eksport - DjView ++ ++ ++ ++ QDjViewExportPS1 ++ ++ ++ Form ++ Not sure about the meaning ++ Formularz ++ ++ ++ ++ Color ++ Kolorystyka ++ ++ ++ ++ &Color ++ &Kolor ++ ++ ++ ++ &GrayScale ++ &Skala szarości ++ ++ ++ ++ Marks ++ Znaczniki ++ ++ ++ ++ Print image &frame ++ Drukuj z &ramką ++ ++ ++ ++ Print crop &marks ++ Zaznacz &cięcia ++ ++ ++ ++ PostScript ++ PostScript ++ ++ ++ ++ Language Level ++ Poziom języka ++ ++ ++ ++ QDjViewExportPS2 ++ ++ ++ Form ++ Formularz ++ ++ ++ ++ Scaling ++ Skalowanie ++ ++ ++ ++ Scale to &fit the page ++ Dopasuj do &strony ++ ++ ++ ++ &Zoom ++ &Skala ++ ++ ++ ++ % ++ % ++ ++ ++ ++ Orientation ++ Orientacja ++ ++ ++ ++ Automatic ++ Automatyczna ++ ++ ++ ++ &Portrait ++ &Portret ++ ++ ++ ++ &Landscape ++ &Krajobraz ++ ++ ++ ++ QDjViewExportPS3 ++ ++ ++ Form ++ Formularz ++ ++ ++ ++ Print sheets suitable for folding a booklet. ++ Drukuj strony do złożenia w broszurę. ++ ++ ++ ++ Advanced ++ Zaawansowane ++ ++ ++ ++ Sheets per booklet: ++ Liczba stron broszury: ++ ++ ++ ++ Unlimited ++ Nieograniczona ++ ++ ++ ++ at most ++ co najwyżej ++ ++ ++ ++ Print ++ Drukuj ++ ++ ++ ++ rectos and versos. ++ recto i verso. ++ ++ ++ ++ rectos only. ++ tylko recto. ++ ++ ++ ++ versos only. ++ tylko verso. ++ ++ ++ ++ Shift rectos and versos by ++ Zwiększ margines przy grzbiecie ++ ++ ++ ++ points. ++ Translation depends on the number ++ punktów. ++ ++ ++ ++ Center: ++ Wyśrodkuj: ++ ++ ++ ++ points ++ pkt ++ ++ ++ ++ plus ++ plus ++ ++ ++ ++ /100 ++ /100 ++ ++ ++ ++ per page. ++ na stronę. ++ ++ ++ ++ QDjViewExportPrn ++ ++ ++ Form ++ Formularz ++ ++ ++ ++ Color ++ Kolorystyka ++ ++ ++ ++ &Color ++ &Kolor ++ ++ ++ ++ &GrayScale ++ &Skala szarości ++ ++ ++ ++ Marks ++ Znaczniki ++ ++ ++ ++ Print image &frame ++ &Ramka ++ ++ ++ ++ Print crop &marks ++ &Cięcia ++ ++ ++ ++ Scaling ++ Skalowanie ++ ++ ++ ++ Scale to &fit the page ++ Dopasuj do &strony ++ ++ ++ ++ &Zoom ++ &Skaluj ++ ++ ++ ++ % ++ ++ ++ ++ ++ Orientation ++ Orientacja ++ ++ ++ ++ Automatic ++ Automatyczna ++ ++ ++ ++ &Portrait ++ &Portret ++ ++ ++ ++ &Landscape ++ &Krajobraz ++ ++ ++ ++ QDjViewExportTiff ++ ++ ++ Form ++ Formularz ++ ++ ++ ++ Resolution ++ Rozdzielczość ++ ++ ++ ++ Maximum image resolution ++ Maksymalna rozdzielczość ++ ++ ++ ++ dpi ++ dpi ++ ++ ++ ++ Compression ++ Kompresja ++ ++ ++ ++ Force &bitonal G4 compression. ++ Wymuś &bitonalną kompresję G4. ++ ++ ++ ++ Allow &lossy JPEG compression. ++ Zezwól na &stratną kompresję JPEG. ++ ++ ++ ++ JPEG &quality ++ &Jakość JPEG ++ ++ ++ ++ Allow &deflate compression. ++ Zezwól na kompresję &deflate. ++ ++ ++ ++ QDjViewFind ++ ++ ++ Case sensitive ++ Kaszta (wielkość) liter ma znaczenie ++ ++ ++ ++ Words only ++ Tylko całe słowa ++ ++ ++ ++ Regular expression ++ Wyrażenie regularne ++ ++ ++ ++ Find Previous (Shift+F3) ++ Znajdź poprzedni (Shift+F3) ++ ++ ++ ++ Find Next (F3) ++ Znajdź następny (F3) ++ ++ ++ ++ Reset search options to default values. ++ Przywróć domyślne wartości opcji wyszukiwania. ++ ++ ++ ++ Options ++ Opcje ++ ++ ++ ++ <html><b>Finding text.</b><br/> Search hits appear progressively as soon as you type a search string. Typing enter jumps to the next hit. To move to the previous or next hit, you can also use the arrow buttons or the shortcuts <tt>F3</tt> or <tt>Shift-F3</tt>. You can also double click a page name. Use the <tt>Options</tt> menu to search words only or to specify the case sensitivity.</html> ++ <html><b>Znajdowanie tekstu.</b><br/> Wyniki wyszukiwania pokazują się sukcesywnie w miarę wprowadzania szukanego napisu. Naciśnięcie Enter przechodzi do następnego wyniku. Można również używać strzałek, aby przejść do poprzedniego lub następnego wyniku, można także używać przycisków strzałek lub klawiszy funkcyjnych <tt>F3</tt> or <tt>Shift-F3</tt>. Można także dwukrotnie kliknąć na nazwę strony na liście wyników. Użyj menu <tt>Opcje</tt> aby szukać tylko całych słów lub uwzględnić kasztę (wielkość) liter.</html> ++ ++ ++ ++ Specify whether search hits must begin on a word boundary. ++ Określ, czy znalezione wyniki muszą zaczynać się na granicy słów. ++ ++ ++ ++ Specify whether searches are case sensitive. ++ Określ, czy wyszukiwanie ma uwzględniać kasztę (wielkość) liter. ++ ++ ++ ++ Regular expressions describe complex string matching patterns. ++ Loose translation ++ Wyrażenia regularne opisują złożone wzorce porównywania napisów. ++ ++ ++ ++ <html><b>Regular Expression Quick Guide</b><ul><li>The dot <tt>.</tt> matches any character.</li><li>Most characters match themselves.</li><li>Prepend a backslash <tt>\</tt> to match special characters <tt>()[]{}|*+.?!^$\</tt>.</li><li><tt>\b</tt> matches a word boundary.</li><li><tt>\w</tt> matches a word character.</li><li><tt>\d</tt> matches a digit character.</li><li><tt>\s</tt> matches a blank character.</li><li><tt>\n</tt> matches a newline character.</li><li><tt>[<i>a</i>-<i>b</i>]</tt> matches characters in range <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt>[^<i>a</i>-<i>b</i>]</tt> matches characters outside range <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt><i>a</i>|<i>b</i></tt> matches either regular expression <tt><i>a</i></tt> or regular expression <tt><i>b</i></tt>.</li><li><tt><i>a</i>{<i>n</i>,<i>m</i>}</tt> matches regular expression <tt><i>a</i></tt> repeated <tt><i>n</i></tt> to <tt><i>m</i></tt> times.</li><li><tt><i>a</i>?</tt>, <tt><i>a</i>*</tt>, and <tt><i>a</i>+</tt> are shorthands for <tt><i>a</i>{0,1}</tt>, <tt><i>a</i>{0,}</tt>, and <tt><i>a</i>{1,}</tt>.</li><li>Use parentheses <tt>()</tt> to group regular expressions before <tt>?+*{</tt>.</li></ul></html> ++ <html><b>Uproszczony opis wyrażeń regularnych</b><ul><li>Kropka <tt>.</tt> uzgadnia się z każdym znakiem.</li><li>Większość znaków uzgadnia się ze sobą.</li><li> Aby uzgodnić znaki specjalne <tt>()[]{}|*+.?!^$\</tt>.</li>poprzedź je ukośnikiem wstecznym <tt>\</tt><li><tt>\b</tt> uzgadnia się z granicą słów.</li><li><tt>\w</tt> uzgadnia się ze znakiem alfabetycznym.</li><li><tt>\d</tt> uzgadnia się ze znakiem cyfry.</li><li><tt>\s</tt> uzgadnia się ze spacją.</li><li><tt>\n</tt>uzgadnia się ze znakiem nowej linii.</li><li><tt>[<i>a</i>-<i>b</i>]</tt> uzgadnia się ze znakami z przedziału <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt>[^<i>a</i>-<i>b</i>]</tt> uzgadnia się ze znakami spoza przedziału <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt><i>a</i>|<i>b</i></tt> uzgadnia się z wyrażeniem regularnym <tt><i>a</i></tt> lub wyrażeniem regularnym <tt><i>b</i></tt>.</li><li><tt><i>a</i>{<i>n</i>,<i>m</i>}</tt> uzgadnia się z wyrażeniem regularnym <tt><i>a</i></tt>powtórzonym od <tt><i>n</i></tt> do <tt><i>m</i></tt> razy.</li><li><tt><i>a</i>?</tt>, <tt><i>a</i>*</tt>, and <tt><i>a</i>+</tt> są skrótem dla <tt><i>a</i>{0,1}</tt>, <tt><i>a</i>{0,}</tt>, i <tt><i>a</i>{1,}</tt>.</li><li>Nawiasy okrągłe <tt>()</tt> służą do grupowania wyrażeń przed <tt>?+*{</tt>.</li></ul></html> ++ ++ ++ ++ QDjViewFind::Model ++ ++ ++ 1 hit ++ 1 wynik ++ ++ ++ ++ %n hits ++ ++ %n wynik ++ %n wyniki ++ %n wyników ++ ++ ++ ++ ++ Page %1 (1 hit) ++ Strona %1 (1 wynik) ++ ++ ++ ++ Page %1 (%n hits) ++ ++ Strona %1 (%n wynik) ++ Strona %1 (%n wyniki) ++ Strona %1 (%n wyników) ++ ++ ++ ++ ++ Searching page %1 (waiting for data.) ++ Przeszukiwanie strony %1 (oczekiwanie na dane.) ++ ++ ++ ++ Searching page %1. ++ Przeszukiwanie strony %1. ++ ++ ++ ++ No hits! ++ Brak wyników! ++ ++ ++ ++ <html>Document is not searchable. No page contains information about its textual content.</html> ++ <html>Dokument nie nadaje się do przeszukiwania. Żadna strona nie zawiera treści tekstowej.</html> ++ ++ ++ ++ <html>Invalid regular expression.</html> ++ <html>Niepoprawne wyrażenie regularne.</html> ++ ++ ++ ++ QDjViewImgExporter ++ ++ ++ %1 Image ++ JPG Image ++ %1 obraz ++ ++ ++ ++ %1 Files (*.%2) ++ JPG Files ++ %1 plików (*.%2) ++ ++ ++ ++ Cannot render page. ++ Nie można zwizualizować strony. ++ ++ ++ ++ Image format %1 not supported. ++ Format obrazu %1 nie jest obsługiwany. ++ ++ ++ ++ QDjViewInfoDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ &Document ++ &Dokument ++ ++ ++ ++ &File ++ &Plik ++ ++ ++ ++ File: ++ Plik: ++ ++ ++ ++ &View Page ++ &Pokaż stronę ++ ++ ++ ++ &Close ++ &Zamknij ++ ++ ++ ++ File # ++ Plik nr ++ ++ ++ ++ File Name ++ Nazwa pliku ++ ++ ++ ++ File Size ++ Rozmiar pliku ++ ++ ++ ++ File Type ++ Typ pliku ++ ++ ++ ++ Page # ++ Strona nr ++ ++ ++ ++ Page Title ++ Tytuł strony ++ ++ ++ ++ <html><b>Document information</b><br>This panel shows information about the document and its component files. Select a component file to display detailed information in the <tt>File</tt> tab. Double click a component file to show the corresponding page in the main window. </html> ++ <html><b>Informacje o dokumencie</b><br>Ten panel zawiera informacje o dokumencie i jego plikach składowych. Wybierz plik składowy, aby wyświetlić szczegółowe informacje w zakładce <tt>Plik</tt> Kliknij dwukrotnie na plik składowy, aby wyświetlić odpowiednią stronę w głównym oknie. </html> ++ ++ ++ ++ <html><b>File and page information</b><br>This panel shows the structure of the DjVu data corresponding to the component file or the page selected in the <tt>Document</tt> tab. The arrow buttons jump to the previous or next component file.</html> ++ <html><b>Informacje o pliku i stronie</b><br>Ten panel pokazuje strukturę danych DjVu odpowiadających plikowi składowemu lub stronie wybranej w zakładce <tt>Dokument</tt> . Klawisze strzałek przenoszą do poprzedniego lub następnego pliku składowego.</html> ++ ++ ++ ++ Waiting for data... ++ Oczekiwanie na dane... ++ ++ ++ ++ Page #%1 ++ Strona nr %1 ++ ++ ++ ++ Thumbnails ++ Miniaturki ++ ++ ++ ++ Shared annotations ++ Adnotacje wspólne ++ ++ ++ ++ Shared data ++ Dane wspólne ++ ++ ++ ++ File #%1 - ++ Plik nr %1 - ++ ++ ++ ++ Single DjVu page ++ Pojedyncza strona DjVu ++ ++ ++ ++ Bundled DjVu document ++ Scalony dokument DjVu ++ ++ ++ ++ Indirect DjVu document ++ Rozłożony dokument DjVu ++ ++ ++ ++ Obsolete bundled DjVu document ++ Przestarzały scalony dokument DjVu ++ ++ ++ ++ Obsolete indexed DjVu document ++ Przestarzały rozłożony dokument DjVu ++ ++ ++ ++ 1 file ++ 1 plik ++ ++ ++ ++ %n files ++ ++ %n plik ++ %n pliki ++ %n plików ++ ++ ++ ++ ++ 1 page ++ 1 strona ++ ++ ++ ++ %n pages ++ ++ %n strona ++ %n strony ++ %n stron ++ ++ ++ ++ ++ ++ n/a ++ nie stosuje się ++ ++ ++ ++ Page ++ Strona ++ ++ ++ ++ Thumbnails ++ Miniaturki ++ ++ ++ ++ Shared ++ Wspólne ++ ++ ++ ++ QDjViewMetaDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ &Document Metadata ++ Metadane &dokumentu ++ ++ ++ ++ &Page Metadata ++ Metadane &strony ++ ++ ++ ++ Page: ++ Strona: ++ ++ ++ ++ &View Page ++ &Pokaż stronę ++ ++ ++ ++ &Close ++ &Zamknij ++ ++ ++ ++ Ctrl+C ++ copy ++ Ctrl+C ++ ++ ++ ++ Key ++ Klawisz ++ ++ ++ ++ Value ++ Wartość ++ ++ ++ ++ <html><b>Document metadata</b><br>This panel displays metadata pertaining to the document, such as author, title, references, etc. This information can be saved into the document with program <tt>djvused</tt>: use the commands <tt>create-shared-ant</tt> and <tt>set-meta</tt>.</html> ++ <html><b>Metadane dokumentu</b><br>Ten panel pokazuje metadane dokumentu, takie jak autor, tytuł, bibliografię itp. Informacje takie mogą być zapisane w dokumencie za pomocą programu <tt>djvused</tt> i komend <tt>create-shared-ant</tt> oraz <tt>set-meta</tt>.</html> ++ ++ ++ ++ <html><b>Page metadata</b><br>This panel displays metadata pertaining to a specific page. Page specific metadata override document metadata. This information can be saved into the document with program <tt>djvused</tt>: use command <tt>select</tt> to select the page and command <tt>set-meta</tt> to specify the metadata entries.</html> ++ <html><b>Metadane strony</b><br>Ten panel pokazuje metadane dotyczące konkretnej strony. Są one ważniejsze od metadanych dokumentu. Ta informacja może być zapisana w dokumencie za pomocą programu <tt>djvused</tt> i komend: <tt>select</tt> w celu wybrania strony i <tt>set-meta</tt> do wstawienia pól metadanych.</html> ++ ++ ++ ++ QDjViewOutline ++ ++ ++ <html><b>Document outline.</b><br/> This panel display the document outline, or the page names when the outline is not available, Double-click any entry to jump to the selected page.</html> ++ <html><b>Zakładki dokumentu.</b><br/> Ten panel pokazuje zakładki dokumentu, lub nazwy stron, jeśli zakładki nie są dostępny. Dwukrotne kliknięcie przenosi do wybranej strony.</html> ++ ++ ++ ++ Outline data is corrupted ++ Dane zakładek są uszkodzone ++ ++ ++ ++ Pages ++ Strony ++ ++ ++ ++ ++ Page %1 ++ Strona %1 ++ ++ ++ ++ ++ Go: page %1. ++ Przejdź do strony %1. ++ ++ ++ ++ Go: %1 ++ Przejdź: %1 ++ ++ ++ ++ QDjViewPSExporter ++ ++ ++ PostScript ++ PostScript ++ ++ ++ ++ ++ PostScript Files (*.ps *.eps) ++ Pliki w formacie PostScript (*.ps *.eps) ++ ++ ++ ++ Encapsulated PostScript ++ Encapsulated PostScript ++ ++ ++ ++ PostScript ++ tab caption ++ PostScript ++ ++ ++ ++ Position ++ tab caption ++ Pozycjonowanie ++ ++ ++ ++ Booklet ++ tab caption ++ Broszura ++ ++ ++ ++ <html><b>PostScript options.</b><br>Option <tt>Color</tt> enables color printing. Document pages can be decorated with frame and crop marks. PostScript language level 1 is only useful with very old printers. Level 2 works with most printers. Level 3 print color document faster on recent printers.</html> ++ <html><b>Opcje języka PostScript.</b><br>Opcje <tt>Kolor</tt> włącza drukowanie w kolorze. Strony dokumentu mogą być uzupełnione o ramki i znaczniki cięcia. Język PostScript poziom 1 jest przydatny tylko dla bardzo starych drukarek. Poziom 2 jest właściwy dla większości drukarek. Poziom 3 drukuje kolorowe dokumenty szybciej na nowszych drukarkach.</html> ++ ++ ++ ++ <html><b>Position and scaling.</b><br>Option <tt>Scale to fit</tt> accommodates whatever paper size your printer uses. Zoom factor <tt>100%</tt> reproduces the initial document size. Orientation <tt>Automatic</tt> chooses portrait or landscape on a page per page basis.</html> ++ <html><b>Pozycjonowanie i skalowanie.</b><br>Opcje <tt>Skaluj, aby dopasować</tt> dostosowuje się do dowolnego rozmiaru papieru. Współczynnik skalowania <tt>100%</tt> zachowuje oryginalny rozmiar dokumentu. Orientacja<tt>Automatyczne</tt> wybiera portret lub krajobraz osobno dla każdej strony.</html> ++ ++ ++ ++ <html><b>Producing booklets.</b><br>The booklet mode prints the selected pages as sheets suitable for folding one or several booklets. Several booklets might be produced when a maximum number of sheets per booklet is specified. You can either use a duplex printer or print rectos and versos separately.<p> Shifting rectos and versos is useful with poorly aligned duplex printers. The center margins determine how much space is left between the pages to fold the sheets. This space slowly increases from the inner sheet to the outer sheet.</html> ++ Loose translation ++ <html><b>Tworzenie broszury.</b><br>Tryb broszury drukuje wybrane strony jako arkusze nadające się do złożenia i utworzenia jednej lub więcej broszur. Kilka broszur można tworzyć kiedy jest określona maksymalna liczba arkuszy na broszurę. Można drukować dwustronnie lub osobno strony recto i strony verso.<p> Przesunięcie stron recto i verso jest przydatny dla drukarek dwustronnych, które nie wyrównują dobrze marginesów. Margines centralny decyduje o tym, ile miejsca jest między stronami na zgięcie arkusza. Ten margines zwiększa się powoli od arkuszy wewnętrznych do arkuszy zewnętrznych.</html> ++ ++ ++ ++ Save job creation failed! ++ Utworzenie zadania zapisania nie powiodło się! ++ ++ ++ ++ QDjViewPdfExporter ++ ++ ++ PDF Document ++ Dokument PDF ++ ++ ++ ++ PDF Files (*.pdf) ++ Pliki PDF (*.pdf) ++ ++ ++ ++ PDF Options ++ tab caption ++ Opcje PDF ++ ++ ++ ++ <html><b>PDF options.</b><br>These options control the characteristics of the images embedded in the exported PDF files. The resolution box limits their maximal resolution. Forcing bitonal G4 compression encodes all pages in black and white using the CCITT Group 4 compression. Allowing JPEG compression uses lossy JPEG for all non bitonal or subsampled images. Otherwise, allowing deflate compression produces more compact files. </html> ++ <html><b>Opcje PDF.</b><br>Te opcje określają własności obrazów zawartych w eksportowanych plikach PDF. Okienko rozdzielczości ogranicza ich maksymalną rozdzielczość. Wymuszenie bitonalnej kompresji oznacza zakodowanie wszystkich stron jako czarno-białych za pomocą kompresji CCITT Group 4. Dopuszczenie kompresji JPEG oznacza użycie stratnej kompresji JPEG dla wszystkich bitonalnych lub podpróbkowanych obrazów. W przeciwnym razie dopuszczenie kompresji deflate tworzy bardziej zwarte pliki. </html> ++ ++ ++ ++ Error while creating pdf file. ++ Błąd w trakcie tworzenia pliku PDF. ++ ++ ++ ++ Unable to create output file. ++ Nie można utworzyć pliku wyjściowego. ++ ++ ++ ++ ++ System error: %1. ++ Błąd systemowy: %1. ++ ++ ++ ++ Unable to reopen temporary file. ++ Nie można ponownie otworzyć pliku tymczasowego. ++ ++ ++ ++ PDF export was not compiled. ++ What it is supposed to mean? ++ Eksport do PDF nie został skompilowany. ++ ++ ++ ++ Unable to create temporary file. ++ Nie można utworzyć pliku tymczasowego. ++ ++ ++ ++ QDjViewPlugin::Document ++ ++ ++ Requesting %1. ++ Zażądano %1. ++ ++ ++ ++ QDjViewPrefsDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ &Screen ++ &Ekran ++ ++ ++ ++ Gamma ++ Współczynnik gamma ++ ++ ++ ++ <html>Screen color correction.<br>Adjust slider until gray shades look similar.</html> ++ <html>Korekta koloru ekranu.<br>Ustaw suwak tak, aby odcienie szarości były podobne.</html> ++ ++ ++ ++ Darker ++ Ciemniej ++ ++ ++ ++ Lighter ++ Jaśniej ++ ++ ++ ++ ++ Display ++ Wyświetlanie ++ ++ ++ ++ Force screen &resolution ++ Wymuś rozdzielczość &ekranową ++ ++ ++ ++ dpi ++ dpi ++ ++ ++ ++ Force inverted luminance ++ Wymuś odwrócenie luminancji ++ ++ ++ ++ &Interface ++ &Interfejs ++ ++ ++ ++ Options for ++ Obsolete? ++ Opcje dla ++ ++ ++ ++ &Remember initial state from last invocation ++ Loose translation ++ &Pamiętaj stan po ostatnim uruchomieniu ++ ++ ++ ++ Show ++ Wyświetlaj ++ ++ ++ ++ &Menu bar ++ Pasek &menu ++ ++ ++ ++ &Tool bar ++ Pasek &narzędzi ++ ++ ++ ++ Sc&rollbars ++ &Suwaki przewijania ++ ++ ++ ++ Stat&us bar ++ Pasek s&tanu ++ ++ ++ ++ &Side bar ++ Panel &boczny ++ ++ ++ ++ &Zoom: ++ Skalowanie too long ++ S&kala: ++ ++ ++ ++ Timer: ++ All reasonable translation too long ++ Timer: ++ ++ ++ ++ s ++ s ++ ++ ++ ++ Display page &frames ++ &Ramki stron ++ ++ ++ ++ Display &annotations ++ &Adnotacje ++ ++ ++ ++ Layout ++ Układ ++ ++ ++ ++ Continuous ++ Ciągły ++ ++ ++ ++ Side-by-side ++ Obok siebie ++ ++ ++ ++ Cover Page ++ Strona tytułowa ++ ++ ++ ++ Right-to-Left ++ Od prawej ++ ++ ++ ++ &Keys ++ &Klawisze ++ ++ ++ ++ Keys ++ Klawisze ++ ++ ++ ++ For displaying hyper&links: ++ Wyświetlanie &hiperłączy: ++ ++ ++ ++ For &selecting text or images: ++ &Zaznaczanie tekstu lub obrazów: ++ ++ ++ ++ For displaying the &lens: ++ Wyświetlanie &lupy: ++ ++ ++ ++ Mouse wheel ++ Rolka myszy ++ ++ ++ ++ Mouse wheel scrolls the page ++ Rolka myszy przewija stronę ++ ++ ++ ++ Mouse wheel changes the zoom factor ++ Rolka myszy zmienia wartość skalowania ++ ++ ++ ++ &Lens ++ &Lupa ++ ++ ++ ++ Enable magnifying &lens ++ Włącz szkło &powiększające ++ ++ ++ ++ Lens options ++ Opcje lupy ++ ++ ++ ++ Lens &size: ++ &Rozmiar okna lupy: ++ ++ ++ ++ Magnifying &power: ++ Stopień &powiększenia: ++ ++ ++ ++ x ++ x ++ ++ ++ ++ pixels ++ pikseli ++ ++ ++ ++ &Network ++ &Sieć ++ ++ ++ ++ Proxy settings ++ Ustawienia serwera pośredniczącego ++ ++ ++ ++ Use pro&xy to access the network ++ Stosuj &serwer pośredniczący ++ ++ ++ ++ &Host: ++ &Serwer: ++ ++ ++ ++ &Port: ++ &Port: ++ ++ ++ ++ &User: ++ &Użytkownik: ++ ++ ++ ++ Pass&word: ++ &Hasło: ++ ++ ++ ++ Cache ++ Pamięć podręczna ++ ++ ++ ++ &Clear ++ &Wyczyść ++ ++ ++ ++ ++ MB ++ MB ++ ++ ++ ++ &Decoded page cache: ++ Pamięć zdekodowanych &stron: ++ ++ ++ ++ &Pixel cache: ++ Pamięć &pikseli: ++ ++ ++ ++ &Advanced ++ &Zaawansowane ++ ++ ++ ++ Interface ++ Interfejs ++ ++ ++ ++ Force language (next time djview runs) ++ Wymuś język (wymaga ponownego uruchomienia) ++ ++ ++ ++ Enable page animations ++ Włącz animację stron ++ ++ ++ ++ Enable advanced features in menus ++ Włącz zaawansowane opcje w menu ++ ++ ++ ++ Show hidden text in status bar ++ Pokazuj na pasku stanu tekst ukryty ++ ++ ++ ++ Miscellaneous ++ Różne ++ ++ ++ ++ Render with openGL when available ++ Wizualizuj za pomocą openGL jeśli jest dostępne ++ ++ ++ ++ Override saving and printing restrictions ++ Ignoruj ograniczenia zapisywania i drukowania ++ ++ ++ ++ Manual printer color correction ++ Ręczna korekta kolorów drukowania ++ ++ ++ ++ gamma= ++ gamma= ++ ++ ++ ++ &Defaults ++ &Wartości domyślne ++ ++ ++ ++ &Apply ++ &Zastosuj ++ ++ ++ ++ &Ok ++ &OK ++ ++ ++ ++ Cancel ++ Anuluj ++ ++ ++ ++ Preferences[*] - DjView ++ Ustawienia - DjView ++ ++ ++ ++ <html><b>Screen gamma correction.</b><br>The best color rendition is achieved by adjusting the gamma correction slider and choosing the position that makes the gray square as uniform as possible.<p><b>Screen resolution.</b><br>This option forces a particular resolution instead of using the unreliable resolution advertised by the operating system. Forcing the resolution to 100 dpi matches the behavior of the djvulibre command line tools.</html> ++ <html><b>Korekcja współczynnika gamma.</b><br> Najlepszą wizualizację kolorów osiąga się przez wybór takiej pozycji suwaka, w której szare kwadraty są najbardziej podobne.<p><b>Rozdzielczość ekranu.</b><br>Ta opcja wymusza konkretną rozdzielczość zamiast rozdzielczości proponowanej przez system operacyjny. Wymuszanie rozdzielczości 100 dpi jest zgodne z zachowaniem programów narzędziowych DjVuLibre.</html> ++ ++ ++ ++ <html><b>Initial interface setup.</b><br>DjView can run as a standalone viewer, as a full screen viewer, as a full page browser plugin, or as a plugin embedded inside a html page. For each case, check the <tt>Remember</tt> box to automatically save and restore the interface setup. Otherwise, specify an initial configuration.</html> ++ <html><b>Początkowe ustawienie interfejsu.</b><br>DjView może pracować jako samodzielna przeglądarka, jako przeglądarka pełnoekranowa, jako pełnoekranowa wtyczka do przeglądarki WWW, i jako wtyczka osadzona na stronie HTML. W każdym przypadku należy zaznaczyć pole wyboru <tt>Pamiętaj</tt> aby automatycznie zapisać i odtworzyć ustawienia interfejsu. W przeciwnym wypadku należy określić konfigurację początkową.</html> ++ ++ ++ ++ <html><b>Modifiers keys.</b><br>Define which combination of modifier keys will show the manifying lens, temporarily enable the selection mode, or highlight the hyperlinks.</html> ++ <html><b>Klawisze modyfikujące.</b><br>Określ, które kombinacje klawiszy wyświetlają lupę, tymczasowo włączają tryb zaznaczania lub uwydatniają hiperłącza.</html> ++ ++ ++ ++ <html><b>Magnifying lens.</b><br>The magnifying lens appears when you depress the modifier keys specified in tab <tt>Keys</tt>. This panel lets you choose the power and the size of the magnifying lens.</html> ++ <html><b>Szkło powiekszające.</b><br>Szkło powiększające ukazuje się po naciśnięciu klawisza modyfikującego określonego w zakładce <tt>Klawisze</tt>. Ten panel pozwala wybrać stopień powiększenia i rozmiar lupy.</html> ++ ++ ++ ++ <html><b>Advanced.</b><br>You can override the default interface language, disable the page animations, or enable additional menu entries that are useful for authoring DjVu files.You can also disable the printing or saving restrictions dictated by certain web sites. The manual color correction can be useful with old printers.</html> ++ <html><b>Zaawansowane.</b><br>Można zmienić domyślny język interfejsu, wyłączyć animację stron, włączyć dodatkowe pozycje menu.Można również wyłączyć ograniczenia drukowania lub zapisywania narzucane przez niektóre witryny internetowe. Ręczna korekta koloru drukowania może być przydatna dla starych drukarek.</html> ++ ++ ++ ++ <html><b>Network proxy settings.</b><br>These proxy settings are used when the standalone djview viewer accesses a djvu document through a http url. The djview plugin always uses the proxy settings of the web browser.<p><b>Cache settings.</b><br>The <i>pixel cache</i> stores image data located outside the visible area. This cache makes panning smoother. The <i>decoded page cache</i> contains partially decoded pages. It provides faster response times when navigating a multipage document or when returning to a previously viewed page. Clearing this cache might be useful to reflect a change in the page data without restarting the DjVu viewer.</html> ++ <html><b>Ustawienia serwera pośredniczącego.</b><br>Te ustawienia są wykorzystywane, gdy samodzielna przeglądarka pobiera dokument za pomocą protokołu HTTP. Wtyczka DjView zawsze używa ustawień przeglądarki internetowej.<p><b>Ustawienia pamięci podręcznej.</b><br><i>Pamięć pikseli</i> przechowuje informacje o fragmentach obrazu, które nie są aktualnie wyświetlane. Powoduje to bardziej płynne pozycjonowanie. <i>Pamięć zdekodowanych stron</i> zawiera częściowo zdekodowane strony. Zapewnia szybszy czas reakcji podczas nawigacji w wielostronicowym dokumencie oraz przy powrocie do poprzednio wyświetlanej strony. Wyczyszczenie pamięci może być pożyteczne dla uwzględnienia zmienionych dany strony bez ponownego uruchamiania programu.</html> ++ ++ ++ ++ Standalone Viewer ++ Samodzielna przeglądarka ++ ++ ++ ++ Standalone Viewer (Full Screen mode) ++ Samodzielna przeglądarka (tryb pełnoekranowy) ++ ++ ++ ++ Standalone Viewer (Slideshow mode) ++ Samodzielna przeglądarka (pokaz slajdów) ++ ++ ++ ++ Full Page Plugin ++ Wtyczka całostronicowa ++ ++ ++ ++ Embedded Plugin ++ Wtyczka osadzona ++ ++ ++ ++ QDjViewPrintDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ ++ Print ++ Drukuj ++ ++ ++ ++ &Document ++ &Dokument ++ ++ ++ ++ C&urrent page ++ &Bieżąca strona ++ ++ ++ ++ &Pages ++ &Strony ++ ++ ++ ++ to ++ do ++ ++ ++ ++ Destination ++ Urządzenie docelowe ++ ++ ++ ++ Print to file ++ Drukuj do pliku ++ ++ ++ ++ Printer name: ++ Nazwa drukarki: ++ ++ ++ ++ Choose ++ Wybierz ++ ++ ++ ++ &Defaults ++ &Wartości domyślne ++ ++ ++ ++ &Ok ++ &OK ++ ++ ++ ++ ++ &Cancel ++ &Anuluj ++ ++ ++ ++ Stop ++ Stop ++ ++ ++ ++ <html><b>Printing.</b><br/> You can print the whole document or a page range. Use the <tt>Choose</tt> button to select a print destination and specify printer options. Additional dialog tabs might appear to specify conversion options.</html> ++ <html><b>Drukowanie.</b><br/> Można drukować cały dokument lub pewien przedział stron. Użyj przycisku <tt>Wybierz</tt> aby wybrać urządzenie i określić opcje drukowania. Mogą pojawić się dodatkowe zakładki z opcjami konwersji.</html> ++ ++ ++ ++ (invalid printer) ++ (drukarka niedostępna) ++ ++ ++ ++ All files ++ save filter ++ Wszystkie pliki ++ ++ ++ ++ Print To File - DjView ++ dialog caption ++ Drukuj do pliku - Djview ++ ++ ++ ++ Question - DjView ++ dialog caption ++ Pytanie - DjView ++ ++ ++ ++ A file with this name already exists. ++Do you want to replace it? ++ Plik o tej nazwie już istnieje ++Czy go zastąpić? ++ ++ ++ ++ &Replace ++ &Zastąp ++ ++ ++ ++ This operation has failed. ++ Ta operacja nie powiodła się. ++ ++ ++ ++ This operation has been interrupted. ++ Ta operacja została przerwana. ++ ++ ++ ++ QDjViewPrnExporter ++ ++ ++ Printer data ++ Dane drukarki ++ ++ ++ ++ PRN Files (*.prn) ++ Pliki PRN (*.prn) ++ ++ ++ ++ Printing Options ++ tab caption ++ Opcje drukowania ++ ++ ++ ++ <html><b>Printing options.</b><br>Option <tt>Color</tt> enables color printing. Document pages can be decorated with a frame. Option <tt>Scale to fit</tt> accommodates whatever paper size your printer uses. Zoom factor <tt>100%</tt> reproduces the initial document size. Orientation <tt>Automatic</tt> chooses portrait or landscape on a page per page basis.</html> ++ <html><b>Opcje drukowania.</b><br>Opcja <tt>Kolor</tt> włącza drukowanie w kolorze. Strony dokumentu mogą być ujęte w ramki. Opcja <tt>Dopasuj do strony</tt> dostosowuje wydruk do dowolnego rozmiaru papieru w drukarce. Współczynnik skalowania równy <tt>100%</tt> zachowuje oryginalny rozmiar dokumentu. Orientacja<tt>Automatycznie/tt> wybiera orientację portret lub krajobraz osobno dla każdej strony.</html> ++ ++ ++ ++ Cannot render page %1. ++ Nie można zwizualizować strony %1. ++ ++ ++ ++ QDjViewSaveDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ Save ++ Zapisz ++ ++ ++ ++ &Document ++ &Dokument ++ ++ ++ ++ C&urrent page ++ &Bieżąca strona ++ ++ ++ ++ &Pages ++ &Strony ++ ++ ++ ++ to ++ do ++ ++ ++ ++ Destination ++ Plik wynikowy ++ ++ ++ ++ Format: ++ Format: ++ ++ ++ ++ Bundled DjVu Document ++ Scalony dokument DjVu ++ ++ ++ ++ Indirect DjVu Document ++ Rozłożony dokument DjVu ++ ++ ++ ++ &Ok ++ &OK ++ ++ ++ ++ ++ &Cancel ++ &Anuluj ++ ++ ++ ++ Stop ++ Stop ++ ++ ++ ++ <html><b>Saving.</b><br/> You can save the whole document or a page range. The bundled format creates a single file. The indirect format creates multiple files suitable for web serving.</html> ++ <html><b>Zapisywanie.</b><br/> Można zapisać cały dokument lub zakres stron. Format scalony tworzy jeden plik. Format rozłożony tworzy wiele plików wygodnych do udostępniania przez serwery internetowe.</html> ++ ++ ++ ++ Error - DjView ++ dialog caption ++ Błąd - DjView ++ ++ ++ ++ Overwriting the current file is not allowed! ++ Nie można zastąpić bieżącego pliku! ++ ++ ++ ++ Question - DjView ++ dialog caption ++ Pytanie - DjView ++ ++ ++ ++ A file with this name already exists. ++Do you want to replace it? ++ Plik o tej nazwie już istnieje ++Czy go zastąpić? ++ ++ ++ ++ &Replace ++ &Zastąp ++ ++ ++ ++ This operation has failed. ++ Ta operacja nie powiodła się. ++ ++ ++ ++ This operation has been interrupted. ++ Ta operacja została przerwana. ++ ++ ++ ++ All files ++ save filter ++ Wszystkie pliki ++ ++ ++ ++ Save - DjView ++ dialog caption ++ Zapisz - DjView ++ ++ ++ ++ QDjViewThumbnails ++ ++ ++ Tiny ++ thumbnail menu ++ Malutkie ++ ++ ++ ++ Small ++ thumbnail menu ++ Małe ++ ++ ++ ++ Medium ++ thumbnail menu ++ Średnie ++ ++ ++ ++ Large ++ thumbnail menu ++ Duże ++ ++ ++ ++ Smart ++ thumbnail menu ++ Sprytne ++ ++ ++ ++ Control Left Mouse Button ++ Control i lewy klawisz myszy ++ ++ ++ ++ Right Mouse Button ++ Prawy klawisz myszy ++ ++ ++ ++ <html><b>Document thumbnails.</b><br/> This panel display thumbnails for the document pages. Double click a thumbnail to jump to the selected page. %1 to change the thumbnail size or the refresh mode. The smart refresh mode only computes thumbnails when the page data is present (displayed or cached.)</html> ++ <html><b>Miniaturki.</b><br/> Ten panel wyświetla miniaturki stron dokumentu. Podwójne kliknięcie na miniaturkę przenosi do odpowiedniej strony. %1 aby zmienić rozmiar miniaturek lub je odświeżyć. Tryb sprytny wyświetla miniaturkę tylko wtedy, gdy strona jest wyświetlana lub znajduje się w pamięci podręcznej.</html> ++ ++ ++ ++ QDjViewTiffExporter ++ ++ ++ TIFF Document ++ Dokument TIFF ++ ++ ++ ++ TIFF Files (*.tiff *.tif) ++ Pliki TIFF (*.tiff *.tif) ++ ++ ++ ++ TIFF Options ++ tab caption ++ Opcje TIFF ++ ++ ++ ++ <html><b>TIFF options.</b><br>The resolution box specifies an upper limit for the resolution of the TIFF images. Forcing bitonal G4 compression encodes all pages in black and white using the CCITT Group 4 compression. Allowing JPEG compression uses lossy JPEG for all non bitonal or subsampled images. Otherwise, allowing deflate compression produces more compact (but less portable) files than the default packbits compression.</html> ++ <html><b>Opcje TIFF </b><br>Pole wyboru rozdzielczości określa maksymalną rozdzielczość obrazów TIFF. Wymuszenie bitonalnej kompresji oznacza zakodowanie wszystkich stron jako czarno-białych za pomocą kompresji CCITT Group 4. Dopuszczenie kompresji JPEG oznacza użycie stratnej kompresji JPEG dla wszystkich bitonalnych lub podpróbkowanych obrazów. W przeciwnym razie dopuszczenie kompresji deflate tworzy bardziej zwarte pliki niż domyślna kompresja packbits.</html> ++ ++ ++ ++ Cannot open output file. ++ Nie można otworzyć pliku wyjściowego. ++ ++ ++ ++ Out of memory. ++ Zabrakło pamięci. ++ ++ ++ ++ Internal error. ++ Błąd wewnętrzny. ++ ++ ++ ++ TIFF export has not been compiled. ++ Eksport do TIFF nie został skompilowany. ++ ++ ++ ++ QDjVuNetDocument ++ ++ ++ Requesting '%1' ++ Zażądano %1 ++ ++ ++ ++ QDjVuNetDocument::Private ++ ++ ++ Received http status %1 while retrieving %2. ++ %1 is an http status code ++ Otrzymano kod statusu %1 podczas pobierania %2. ++ ++ ++ ++ Received <%1> data while retrieving %2. ++ %1 is a mime type ++ Otrzymano typ danych <%1> w czasie pobierania %2. ++ ++ ++ ++ %1 while retrieving '%2'. ++ %1 w czasie pobierania %2. ++ ++ ++ ++ Cannot validate the certificate for server %1. ++ Nie można potwierdzić certyfikatu serwera %1. ++ ++ ++ ++ Authentication required for %1 (%2). ++ Autoryzacja wymagana dla %1 (%2). ++ ++ ++ ++ Authentication required for proxy %1. ++ Autoryzacja wymagana dla serwera pośredniczącego %1. ++ ++ ++ +--- djview4-4.12.orig/src/qdjviewexporters.cpp ++++ djview4-4.12/src/qdjviewexporters.cpp +@@ -405,9 +405,9 @@ QDjViewDjVuExporter::save(QString fname) + fromPage = qBound(0, fromPage, pagenum-1); + QByteArray pagespec; + if (fromPage == toPage && pagenum > 1) +- pagespec.append(QString("--pages=%1").arg(fromPage+1)); ++ pagespec.append(QString("--pages=%1").arg(fromPage+1).toLocal8Bit()); + else if (fromPage != 0 || toPage != pagenum - 1) +- pagespec.append(QString("--pages=%1-%2").arg(fromPage+1).arg(toPage+1)); ++ pagespec.append(QString("--pages=%1-%2").arg(fromPage+1).arg(toPage+1).toLocal8Bit()); + QByteArray namespec; + if (indirect) + namespec = "--indirect=" + fname.toUtf8(); +--- djview4-4.12.orig/src/qdjviewprefs.cpp ++++ djview4-4.12/src/qdjviewprefs.cpp +@@ -1021,7 +1021,7 @@ QDjViewPrefsDialog::loadLanguageComboBox + { + // supported languages + static const char *languages[] = { +- "cs","de","en","es","fr","it","ja","ru","uk", ++ "cs","de","en","es","fr","it","ja","pl","ru","uk", + "zh_CN","zh_TW",0 } ; + // get application + QComboBox *cb = d->ui.languageComboBox; +--- djview4-4.12.orig/src/qdjvuwidget.cpp ++++ djview4-4.12/src/qdjvuwidget.cpp +@@ -3669,7 +3669,7 @@ MapArea::paintPermanent(QPaintDevice *w, + QRect r = rect.adjusted(bw, bw, -bw, -bw); + QString s = miniexp_to_qstring(comment); + paint.setPen(foregroundColor); +- int flags = Qt::AlignCenter|Qt::AlignVCenter|Qt::TextWordWrap; ++ int flags = Qt::AlignVCenter|Qt::TextWordWrap; + QFont font = paint.font(); + // estimate font size + int size = (int)(z * 0.12); +@@ -3678,11 +3678,11 @@ MapArea::paintPermanent(QPaintDevice *w, + QRect br; + font.setPixelSize(size); + paint.setFont(font); +- paint.drawText(r,flags|Qt::TextDontPrint,s,&br); ++ paint.drawText(r,flags|Qt::AlignHCenter|Qt::TextDontPrint,s,&br); + if (r.contains(br)) + { + // found good font size +- paint.drawText(r,flags,s,0); ++ paint.drawText(r,flags|Qt::AlignLeft,s,0); + break; + } + size -= 1; diff --git a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild index 1e06bc91c6..1c3abd7838 100644 --- a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild +++ b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild @@ -29,8 +29,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=enblend-enfuse -VERSION=${VERSION:-20191019_4c30a326b3f4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20250707_993fd4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/graphics/enblend-enfuse/enblend-enfuse.info b/graphics/enblend-enfuse/enblend-enfuse.info index 657d77a78f..ff9195521e 100644 --- a/graphics/enblend-enfuse/enblend-enfuse.info +++ b/graphics/enblend-enfuse/enblend-enfuse.info @@ -1,8 +1,8 @@ PRGNAM="enblend-enfuse" -VERSION="20191019_4c30a326b3f4" +VERSION="20250707_993fd4" HOMEPAGE="http://enblend.sourceforge.net/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/enblend-enfuse-20191019_4c30a326b3f4.tar.xz" -MD5SUM="93c9ce25de51c00f84d90b05532a4964" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/enblend-enfuse-20250707_993fd4.tar.xz" +MD5SUM="1ffc8db6b978eb90c243b797496cda0e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="vigra" diff --git a/graphics/feh/feh.SlackBuild b/graphics/feh/feh.SlackBuild index e0cb56abdb..fd2e250cea 100644 --- a/graphics/feh/feh.SlackBuild +++ b/graphics/feh/feh.SlackBuild @@ -82,6 +82,9 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + +sed -i '/netdb/a #include ' src/imlib.c +patch -p1 < $CWD/mkstemp.patch + CFLAGS="$SLKCFLAGS" \ make \ PREFIX=/usr \ diff --git a/graphics/feh/mkstemp.patch b/graphics/feh/mkstemp.patch new file mode 100644 index 0000000000..586c7d9703 --- /dev/null +++ b/graphics/feh/mkstemp.patch @@ -0,0 +1,16 @@ +diff -up feh-3.10.3/src/imlib.c.orig feh-3.10.3/src/imlib.c +--- feh-3.10.3/src/imlib.c.orig 2024-09-08 22:51:00.354957296 -0500 ++++ feh-3.10.3/src/imlib.c 2024-09-08 22:56:21.891617710 -0500 +@@ -880,11 +880,7 @@ static char *feh_http_load_image(char *u + + D(("sfn is %s\n", sfn)) + +-#ifdef HAVE_MKSTEMPS +- fd = mkstemps(sfn, strlen(basename) + 1); +-#else +- fd = mkstemp(sfn); +-#endif ++fd = mkstemp(sfn); + + if (fd != -1) { + sfp = fdopen(fd, "w+"); diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild index 905f220e67..c7dac320c0 100644 --- a/graphics/fontforge/fontforge.SlackBuild +++ b/graphics/fontforge/fontforge.SlackBuild @@ -112,6 +112,8 @@ mv uthash-"$UTHASH" uthash chown -R root:root gnulib uthash chmod -R u+w,go+r-w,a-s gnulib uthash +patch -p1 < $CWD/gettext-0.22.patch + mkdir -p build cd build cmake \ diff --git a/graphics/fontforge/gettext-0.22.patch b/graphics/fontforge/gettext-0.22.patch new file mode 100644 index 0000000000..4ab36b7908 --- /dev/null +++ b/graphics/fontforge/gettext-0.22.patch @@ -0,0 +1,150 @@ +diff -Naur fontforge-20201107.orig/po/fr.po fontforge-20201107/po/fr.po +--- fontforge-20201107.orig/po/fr.po 2020-11-07 21:42:58.000000000 +0100 ++++ fontforge-20201107/po/fr.po 2023-06-20 19:49:55.755110000 +0200 +@@ -273,7 +273,7 @@ + msgid "Bad Reference" + msgstr "Référence incorrecte" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" + "But %1$s does not exist in this font, nor can I find the original character " +@@ -297,7 +297,7 @@ + msgid "_No" + msgstr "_Non" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" + "But %1$s does not exist in this font.\n" +@@ -320,7 +320,7 @@ + msgid "Duplicate Anchor" + msgstr "Ancre en double" + +-#, c-format ++#, fuzzy, c-format + msgid "There is already an anchor point named %1$.40s in %2$.40s." + msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs." + +@@ -491,7 +491,7 @@ + msgid "_Use It" + msgstr "_Utilisez la" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've " + "been able to find is %1$.20s-%2$.20s-%4$d.\n" +@@ -1239,7 +1239,7 @@ + msgid "_Revert" + msgstr "_Revenir" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "Font %1$.40s in file %2$.40s has been changed.\n" + "Reverting the file will lose those changes.\n" +@@ -4464,7 +4464,7 @@ + "Il n'y a pas d'entrée ForceBoldThreshold dans la fonte grasse, mais il y a " + "une entrée ForceBold dans la fonte %30s" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The fonts %1$.30s and %2$.30s have a different number of glyphs or different " + "encodings" +@@ -4472,7 +4472,7 @@ + "Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des " + "codages différents" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, " + "one cubic)" +@@ -4525,7 +4525,7 @@ + "Le glyphe %1$.30s de la fonte %2$.30s possède des contours orientés de " + "manière différente que ceux de %3$.30s" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The glyph %1$.30s in font %2$.30s has a different number of references than " + "in %3$.30s" +@@ -4566,7 +4566,7 @@ + "pas à ceux de %4$.30s (nombre différent ou critères de recouvrement " + "différents)" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours " + "than in %3$.30s" +@@ -8022,7 +8022,7 @@ + msgid "Not Found" + msgstr "Non trouvé" + +-#, c-format ++#, fuzzy, c-format + msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s" + msgstr "" + "Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs" +@@ -10453,7 +10453,7 @@ + #. GT: $2 is the glyph's encoding + #. GT: $3 is the pixel size of the bitmap font + #. GT: $4 is the font name +-#, c-format ++#, fuzzy, c-format + msgid "%1$.80s at %2$d size %3$d from %4$.80s" + msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs" + +@@ -11982,7 +11982,7 @@ + #. GT: $2 is the glyph's encoding + #. GT: $3 is the font name + #. GT: $4 is the changed flag ('*' for the changed items) +-#, c-format ++#, fuzzy, c-format + msgid "%1$.80s at %2$d from %3$.90s%4$s" + msgstr "%1$.80s à %2$d de %3$.90hs%4$s" + +@@ -23087,7 +23087,7 @@ + msgid "Use Kerning Class?" + msgstr "Utiliser la classe de crénage ?" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "This kerning pair (%.20s and %.20s) is currently part of a kerning class " + "with a 0 offset for this combination. Would you like to alter this kerning " +diff -Naur fontforge-20201107.orig/po/it.po fontforge-20201107/po/it.po +--- fontforge-20201107.orig/po/it.po 2020-11-07 21:42:58.000000000 +0100 ++++ fontforge-20201107/po/it.po 2023-06-20 19:50:45.026110000 +0200 +@@ -497,7 +497,7 @@ + msgid "_Use It" + msgstr "_Utilizza la" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've " + "been able to find is %1$.20s-%2$.20s-%4$d.\n" +@@ -1190,7 +1190,7 @@ + msgid "_Revert" + msgstr "_Ripristina" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "Font %1$.40s in file %2$.40s has been changed.\n" + "Reverting the file will lose those changes.\n" +@@ -4228,7 +4228,7 @@ + "supported in a font with variations" + msgstr "" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The glyph %1$.30s has a different number of contours in font %2$.30s than in " + "%3$.30s" diff --git a/graphics/fritzing/fritzing.SlackBuild b/graphics/fritzing/fritzing.SlackBuild index bcce96e270..67f86d273c 100644 --- a/graphics/fritzing/fritzing.SlackBuild +++ b/graphics/fritzing/fritzing.SlackBuild @@ -87,6 +87,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/gcc14.patch + # Patch for libgti2 vesion >= 1.0. patch -p1 < $CWD/libgit2-version.patch diff --git a/graphics/fritzing/gcc14.patch b/graphics/fritzing/gcc14.patch new file mode 100644 index 0000000000..66c905c4eb --- /dev/null +++ b/graphics/fritzing/gcc14.patch @@ -0,0 +1,22 @@ +--- a/src/lib/quazip/unzip.c 2019-05-08 12:46:46.000000000 -0500 ++++ b/src/lib/quazip/unzip.c 2025-04-05 17:49:37.273641245 -0500 +@@ -1174,7 +1174,7 @@ + if (password != NULL) + { + int i; +- s->pcrc_32_tab = get_crc_table(); ++ s->pcrc_32_tab = (const long unsigned int *)get_crc_table(); + init_keys(password,s->keys,s->pcrc_32_tab); + if (ZSEEK(s->z_filefunc, s->filestream, + s->pfile_in_zip_read->pos_in_zipfile + +--- a/src/lib/quazip/zip.c 2019-05-08 12:46:46.000000000 -0500 ++++ b/src/lib/quazip/zip.c 2025-04-05 19:02:34.939833765 -0500 +@@ -889,7 +889,7 @@ + unsigned char bufHead[RAND_HEAD_LEN]; + unsigned int sizeHead; + zi->ci.encrypt = 1; +- zi->ci.pcrc_32_tab = get_crc_table(); ++ zi->ci.pcrc_32_tab = (const long unsigned int *)get_crc_table(); + /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/ + + sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting); diff --git a/graphics/gimagereader/gimagereader.SlackBuild b/graphics/gimagereader/gimagereader.SlackBuild index 7ed1d2accb..593c4bbf0d 100644 --- a/graphics/gimagereader/gimagereader.SlackBuild +++ b/graphics/gimagereader/gimagereader.SlackBuild @@ -79,6 +79,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/remove_enchant-provider.patch + # Path where manual will be installed sed -i 's,"share/doc/gimagereader","doc/'$PRGNAM-$VERSION'",' CMakeLists.txt || exit 1 diff --git a/graphics/gimagereader/remove_enchant-provider.patch b/graphics/gimagereader/remove_enchant-provider.patch new file mode 100644 index 0000000000..14820d2f08 --- /dev/null +++ b/graphics/gimagereader/remove_enchant-provider.patch @@ -0,0 +1,68 @@ +From e72d657a408dc6b77c48c086feede31e08700b4c Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Fri, 14 Jun 2024 00:37:20 +0200 +Subject: [PATCH] Work around enchant_get_prefix_dir which is not available + anymore in recent enchant + +--- + gtk/src/Config.cc | 7 ------- + qt/src/Config.cc | 10 ++++++---- + 2 files changed, 6 insertions(+), 11 deletions(-) + +diff --git a/gtk/src/Config.cc b/gtk/src/Config.cc +index fcec9645..73a68893 100644 +--- a/gtk/src/Config.cc ++++ b/gtk/src/Config.cc +@@ -24,7 +24,6 @@ + #include "Utils.hh" + #include "OutputEditorText.hh" + +-#include + #define USE_STD_NAMESPACE + #include + #if TESSERACT_MAJOR_VERSION < 5 +@@ -214,13 +213,7 @@ void Config::openSpellingDir() { + + std::string Config::spellingLocation(Location location) { + if(location == SystemLocation) { +-#ifdef G_OS_WIN32 + std::string dataDir = Glib::build_filename(pkgDir, "share"); +-#else +- char* prefix = enchant_get_prefix_dir(); +- std::string dataDir = Glib::build_filename(prefix, "share"); +- free(prefix); +-#endif + #if HAVE_ENCHANT2 + if(Gio::File::create_for_path(Glib::build_filename(dataDir, "myspell"))->query_exists()) { + return Glib::build_filename(dataDir, "myspell"); +diff --git a/qt/src/Config.cc b/qt/src/Config.cc +index efc788e2..fb6d2e58 100644 +--- a/qt/src/Config.cc ++++ b/qt/src/Config.cc +@@ -25,10 +25,10 @@ + + #include + #include ++#include + #include + #include + #include +-#include + #define USE_STD_NAMESPACE + #include + #if TESSERACT_MAJOR_VERSION < 5 +@@ -200,9 +200,11 @@ QString Config::spellingLocation(Location location) { + #ifdef Q_OS_WIN + QDir dataDir = QDir(QString("%1/../share/").arg(QApplication::applicationDirPath())); + #else +- char* prefix = enchant_get_prefix_dir(); +- QDir dataDir(QDir(prefix).absoluteFilePath("share")); +- free(prefix); ++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ++ QDir dataDir = QDir(QString("%1/share/").arg(QLibraryInfo::path(QLibraryInfo::PrefixPath))); ++#else ++ QDir dataDir = QDir(QString("%1/share/").arg(QLibraryInfo::location(QLibraryInfo::PrefixPath))); ++#endif + #endif + #if HAVE_ENCHANT2 + if(QDir(dataDir.absoluteFilePath("myspell")).exists()) { diff --git a/graphics/gmic/gmic.SlackBuild b/graphics/gmic/gmic.SlackBuild index ae724de793..698d40d4a3 100644 --- a/graphics/gmic/gmic.SlackBuild +++ b/graphics/gmic/gmic.SlackBuild @@ -26,9 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gmic -VERSION=${VERSION:-2.9.4} -COMMUNITYVERSION=${COMMUNITYVERSION:-6e9a20ef40e1db99c9b761853ad493ee7439e1b7} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.5.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,10 +71,7 @@ rm -rf $PRGNAM rm -rf $PRGNAM-community rm -rf $PRGNAM-qt tar xvf $CWD/$PRGNAM\_$VERSION.tar.gz --warning=no-unknown-keyword -mv $PRGNAM-$VERSION $PRGNAM -unzip $CWD/$PRGNAM-community-$COMMUNITYVERSION.zip || unzip $CWD/$COMMUNITYVERSION -mv $PRGNAM-community-$COMMUNITYVERSION $PRGNAM-community -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 \ @@ -92,27 +88,24 @@ sed -i -e "s|LIB = lib|LIB = lib$LIBDIRSUFFIX|g" \ sed -i -e "s|-Ofast|-O2 -fno-fast-math --std=c++11|g" \ gmic-qt/gmic_qt.pro || exit 1 -make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " +make -j1 -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " cd gmic-qt qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=none -make +make -j1 qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=gimp -make +make -j1 qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=krita -make +make -j1 -cd ../zart -qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=off QMAKE_CXXFLAGS+=" -DOPENCV2_HEADERS" -make cd .. -make -C src install LIB=lib$LIBDIRSUFFIX DESTDIR="$PKG" USR="/usr" - -rmdir $PKG/usr/share || true +make -j1 -C src install LIB=lib$LIBDIRSUFFIX DESTDIR="$PKG" USR="/usr" find $PKG -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 + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING* README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/gmic/gmic.info b/graphics/gmic/gmic.info index 5f7b119ad6..e90056a05d 100644 --- a/graphics/gmic/gmic.info +++ b/graphics/gmic/gmic.info @@ -1,10 +1,8 @@ PRGNAM="gmic" -VERSION="2.9.4" +VERSION="3.5.3" HOMEPAGE="https://gmic.eu" -DOWNLOAD="https://gmic.eu/files/source/gmic_2.9.4.tar.gz \ - https://github.com/dtschump/gmic-community/archive/6e9a20ef40e1db99c9b761853ad493ee7439e1b7.zip" -MD5SUM="e0d396ab6406c9baeb4929c1dd6a0d6a \ - 75f88fa1423f253714e84905a05f37da" +DOWNLOAD="https://gmic.eu/files/source/gmic_3.5.3.tar.gz" +MD5SUM="720adc19d70614456132bb6497353a46" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/gpicview/README b/graphics/gpicview/README index 535b23c691..e99809f09d 100644 --- a/graphics/gpicview/README +++ b/graphics/gpicview/README @@ -3,3 +3,7 @@ program is not aimed to be powerful or feature-rich. It's aimed to replace the default image viewer of current desktop systems. Fast-startup, low memory usage, and a simple user interface make it a good choice for default viewer. + +If you want to build this for gtk+3, pass to the script the switch + + GTK3=yes diff --git a/graphics/gpicview/gpicview.SlackBuild b/graphics/gpicview/gpicview.SlackBuild index cfbe30d77c..d25a1a5363 100644 --- a/graphics/gpicview/gpicview.SlackBuild +++ b/graphics/gpicview/gpicview.SlackBuild @@ -6,7 +6,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gpicview -VERSION=${VERSION:-0.2.5} +VERSION=${VERSION:-0.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -19,9 +19,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -45,20 +42,24 @@ else LIBDIRSUFFIX="" fi +WITHGTK3="" ; [ "${GTK3:-no}" = "yes" ] && WITHGTK3="--enable-gtk3" + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +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 {} \; + +./autogen.sh || true CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -68,6 +69,8 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + $WITHGTK3 \ + --disable-silent-rules \ --build=$ARCH-slackware-linux make diff --git a/graphics/gpicview/gpicview.info b/graphics/gpicview/gpicview.info index e9658aff3c..5e55bedda8 100644 --- a/graphics/gpicview/gpicview.info +++ b/graphics/gpicview/gpicview.info @@ -1,8 +1,8 @@ PRGNAM="gpicview" -VERSION="0.2.5" +VERSION="0.3.1" HOMEPAGE="http://lxde.sourceforge.net/gpicview/" -DOWNLOAD="http://downloads.sourceforge.net/lxde/gpicview-0.2.5.tar.xz" -MD5SUM="26be9b0c5a234f1afe7d83d02a4a33f4" +DOWNLOAD="https://github.com/lxde/releases/raw/refs/heads/master/releases/gpicview-0.3.1.tar.xz" +MD5SUM="7da80dfd07f425e6c1eb139a325a6c33" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/graphviz/README b/graphics/graphviz/README deleted file mode 100644 index b7a84ae8ef..0000000000 --- a/graphics/graphviz/README +++ /dev/null @@ -1,11 +0,0 @@ -Graphviz is open source graph visualization software. It has several -main graph layout programs. It also has web and interactive graphical -interfaces, and auxiliary tools, libraries, and language bindings. - -Graph visualization is a way of representing structural information as -diagrams of abstract graphs and networks. Automatic graph drawing has -many important applications in software engineering, database and web -design, networking, and in visual interfaces for many other domains. - -gts and DevIL are autodetected optional dependencies. -ocaml is an optional dependency, if you want OCaml bindings. diff --git a/graphics/graphviz/doinst.sh b/graphics/graphviz/doinst.sh deleted file mode 100644 index 86cc279c4d..0000000000 --- a/graphics/graphviz/doinst.sh +++ /dev/null @@ -1,18 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD|md5sum)" = "$(cat $NEW|md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/php.d/graphviz.ini.new - -# Configure plugins -# (writes /usr/lib*/graphviz/config6 with available plugin information) -chroot . /usr/bin/dot -c diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild deleted file mode 100644 index 4d1aff5b44..0000000000 --- a/graphics/graphviz/graphviz.SlackBuild +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/bash - -# Slackware build script for graphviz - -# Copyright 2022 Yth | Pont-en-Royans, France | yth@ythogtha.org -# Copyright 2007 Robby Workman -# Copyright 2011 Heinz Wiesinger -# Copyright 2013-2017 Audrius Kažukauskas -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=graphviz -VERSION=${VERSION:-14.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - 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 {} \; - -./autogen.sh -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --disable-static \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -# Install config file for PHP. -mkdir -p $PKG/etc/php.d -cat $CWD/graphviz.ini > $PKG/etc/php.d/graphviz.ini.new - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -# Remove empty directories of language bindings that are absent. -find $PKG/usr/lib${LIBDIRSUFFIX}/graphviz -depth -type d -empty -exec rmdir {} \; - -# Create a "dummy" config file in /usr/lib${LIBDIRSUFFIX}/graphviz so that it -# will be removed when the package is uninstalled. This file is generated by -# the postinstall script and contains information about available plugins, so -# this is (or at least should be) safe. -# -# Write some dummy content to it to avoid -# "Error: /usr/lib64/graphviz/config6 is zero sized, or other read error." -# message during installation. -echo '# Dummy content.' > $PKG/usr/lib${LIBDIRSUFFIX}/graphviz/config6 - -mkdir -p $PKG/usr/doc -mv $PKG/usr/share/doc/$PRGNAM/ $PKG/usr/doc/$PRGNAM-$VERSION -rmdir $PKG/usr/share/doc -cp -a README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -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 -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/graphics/graphviz/graphviz.info b/graphics/graphviz/graphviz.info deleted file mode 100644 index 6d4e53d933..0000000000 --- a/graphics/graphviz/graphviz.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="graphviz" -VERSION="14.0.0" -HOMEPAGE="https://www.graphviz.org/" -DOWNLOAD="https://gitlab.com/graphviz/graphviz/-/archive/14.0.0/graphviz-14.0.0.tar.bz2" -MD5SUM="7a3af058e77448450717623bf7a158b6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Yth - Arnaud" -EMAIL="yth@ythogtha.org" diff --git a/graphics/graphviz/graphviz.ini b/graphics/graphviz/graphviz.ini deleted file mode 100644 index 107db738b0..0000000000 --- a/graphics/graphviz/graphviz.ini +++ /dev/null @@ -1,12 +0,0 @@ -; Enable graphviz extension module -; extension=gv.so - -; Graphviz' own documentation mentions a "gv.php" file that should -; be included. This file is however not necessary, it is just a -; wrapper class around functions that are already available after -; loading the extension, just leave out the "gv::" prefix. -; In case you still prefer to use the wrapper class you have to -; include it using its absolute path: -; diff --git a/graphics/graphviz/slack-desc b/graphics/graphviz/slack-desc deleted file mode 100644 index 9d95b0ed3d..0000000000 --- a/graphics/graphviz/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -graphviz: graphviz (Graph Visualization) -graphviz: -graphviz: Graphviz is open source graph visualization software. -graphviz: It has several main graph layout programs. It also has -graphviz: web and interactive graphical interfaces, and auxiliary -graphviz: tools, libraries, and language bindings. -graphviz: -graphviz: Homepage: https://www.graphviz.org/ -graphviz: -graphviz: -graphviz: diff --git a/graphics/hugin/boost-1.85.0-patch.gz b/graphics/hugin/boost-1.85.0-patch.gz deleted file mode 100644 index d03ca9fd5e313e79e34587004f48ec7eaab50bf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmV-~0ek)*iwFp~$0TL|17dG)b95~+E;uzVFfDLlbYo}$rBY36!axu`H{gF5=rP^6 ziP6|?6%kSmSOpXNaav+B(S^7P+1S>9-)I$Wi>0)47-nbRyti*yLI|iLsxQ|IA^AL1 zxG&eGNL4)%DXNVsab+xxER8QLYBdOL650lfGV_|5wm}a8I<+X(bY1@~=a$bV)Fze* zCS{Z|%Q75?nvHg&dEo2yfVAwZ7U)$rE$H<$*v2KwSR}RmLC7dw#|XFcEK}ttl|1k6 zQ8HYi%EJgDQP6=Ml(8fBrlye{Ta1a22$KhQ`Z)Chm%C4%A9&-z_Zh~bEZ^`fFGVI9 z%U-Z}Ekuc2Bply_DpgI>Kc1LCe=_j{Ua|V#WZdnT)Uheu-viX^ASCp+3Sb(J4WW!7 z4NENGj2;LDG3EtE6)HX@S}Qy^q$-uF86NR}_Nz_}@7xNxIQYd>;r}ImTiP58Qh`tZDDHpHm_B0ssIrxUqNu diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild index e90b451e18..a8a264326b 100644 --- a/graphics/hugin/hugin.SlackBuild +++ b/graphics/hugin/hugin.SlackBuild @@ -34,8 +34,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hugin -VERSION=${VERSION:-2023.0.0} -BUILD=${BUILD:-3} +VERSION=${VERSION:-2024.0.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -78,9 +78,6 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION - -zcat $CWD/boost-1.85.0-patch | patch -p0 - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -88,15 +85,16 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +sed -e 's|copy_option::overwrite_if_exists|copy_options::overwrite_existing|' \ + -i src/hugin_base/hugin_utils/filesystem.h || exit 1 +sed -i 's,filesystem system,filesystem,' CMakeLists.txt + mkdir -p build cd build cmake \ - -DwxWidgets_CONFIG_EXECUTABLE=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0 \ - -DwxWidgets_wxrc_EXECUTABLE=/usr/bin/wxrc-3.0 \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ - -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ -DLIB_SUFFIX="$LIBDIRSUFFIX" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/graphics/hugin/hugin.info b/graphics/hugin/hugin.info index 39bbc764eb..f6447815ce 100644 --- a/graphics/hugin/hugin.info +++ b/graphics/hugin/hugin.info @@ -1,10 +1,10 @@ PRGNAM="hugin" -VERSION="2023.0.0" +VERSION="2024.0.1" HOMEPAGE="http://hugin.sourceforge.net/" -DOWNLOAD="https://downloads.sourceforge.net/hugin/hugin-2023.0.0.tar.bz2" -MD5SUM="a0a14535cc5a06b75940c4d3a989b658" +DOWNLOAD="https://downloads.sourceforge.net/hugin/hugin-2024.0.1.tar.bz2" +MD5SUM="7e8ce50af10ace1a900e097ece206123" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="enblend-enfuse exiftool libpano13 tclap wxGTK3" +REQUIRES="enblend-enfuse exiftool libpano13 tclap wxWidgets" MAINTAINER="titopoquito" EMAIL="titopoquito@gmail.com" diff --git a/graphics/imv/imv-4.5.0-Link-to-the-common-ICU-library.patch b/graphics/imv/imv-4.5.0-Link-to-the-common-ICU-library.patch new file mode 100644 index 0000000000..2050348a77 --- /dev/null +++ b/graphics/imv/imv-4.5.0-Link-to-the-common-ICU-library.patch @@ -0,0 +1,27 @@ +From 859c3fd09c1b8c30998b03da9002e7f00b6670cc Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin +Date: Wed, 22 Jan 2025 00:50:53 -0800 +Subject: [PATCH imv] Link to the common ICU library + +Both the utext and the ubrk APIs are parts of the common library, so +icu-uc should be the right dependency to use. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index ea3a653..9fa1b15 100644 +--- a/meson.build ++++ b/meson.build +@@ -42,7 +42,7 @@ endif + + _unicode = get_option('unicode') + if _unicode == 'icu' +- unicode_lib = dependency('icu-io') ++ unicode_lib = dependency('icu-uc') + add_project_arguments('-DIMV_USE_ICU', language: 'c') + elif _unicode == 'grapheme' + unicode_lib = cc.find_library('grapheme') +-- +2.48.1 + diff --git a/graphics/imv/imv.SlackBuild b/graphics/imv/imv.SlackBuild index 51a2f1d939..331350705c 100644 --- a/graphics/imv/imv.SlackBuild +++ b/graphics/imv/imv.SlackBuild @@ -78,6 +78,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + +patch -p1 < $CWD/imv-4.5.0-Link-to-the-common-ICU-library.patch + # meson takes an option to say where to install the config file, but # it doesn't actually change where the binary looks for it. sed -i -e 's,/etc/imv_config,/etc/imv/imv_config,' \ diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index a4e37fb504..979e69cb75 100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=inkscape -VERSION=${VERSION:-1.3.2} -EXTRAVER=${EXTRAVER:-2023-11-25_091e20ef0f} +VERSION=${VERSION:-1.4.2} +EXTRAVER=${EXTRAVER:-2025-05-08_ebf0e940d0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,8 +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 {} \; -# strip invalid tag -sed -i /url/d org.inkscape.Inkscape.appdata.xml.in +patch -p1 < $CWD/poppler-25.06.patch +patch -p1 < $CWD/poppler-25.07.patch +patch -p1 < $CWD/poppler-25.09.patch # https://bugs.launchpad.net/inkscape/+bug/314381 # a couple of files have executable bits set, @@ -88,11 +89,6 @@ find . -name '*.h' | xargs chmod -x # Fix end of line encodings dos2unix -k -q share/extensions/*.py -# Fix man page location: -sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g" - -patch -p1 < $CWD/libxml2-2.12.patch - mkdir -p build cd build # imagemagick >= 7.x is unsupported yet, so use GraphicsMagick @@ -109,6 +105,7 @@ cd build -DBUILD_SHARED_LIBS=ON \ -DWITH_GRAPHICS_MAGICK=ON \ -DWITH_IMAGE_MAGICK=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ .. make make install DESTDIR=$PKG diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info index b3887b766d..9cac4eff0d 100644 --- a/graphics/inkscape/inkscape.info +++ b/graphics/inkscape/inkscape.info @@ -1,10 +1,10 @@ PRGNAM="inkscape" -VERSION="1.3.2" +VERSION="1.4.2" HOMEPAGE="http://www.inkscape.org/" -DOWNLOAD="https://inkscape.org/gallery/item/44615/inkscape-1.3.2.tar.xz" -MD5SUM="76ed1f4b13065e80de8b2d77b6427b83" +DOWNLOAD="https://media.inkscape.org/dl/resources/file/inkscape-1.4.2.tar.xz" +MD5SUM="0c24e84085bed3f0237d1cdf0856a855" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="GraphicsMagick gdl dos2unix libcdr python3-lxml python2-numpy potrace pstoedit scour 2geom" +REQUIRES="GraphicsMagick gdl dos2unix libcdr python3-lxml python3-numpy potrace pstoedit scour 2geom" MAINTAINER="Fernando Lopez Jr." EMAIL="fernando.lopezjr@gmail.com" diff --git a/graphics/inkscape/poppler-25.06.patch b/graphics/inkscape/poppler-25.06.patch new file mode 100644 index 0000000000..93142dc215 --- /dev/null +++ b/graphics/inkscape/poppler-25.06.patch @@ -0,0 +1,121 @@ +From 40f5b15b7e29908b79c54e81db6f340936102e08 Mon Sep 17 00:00:00 2001 +From: Rafael Siejakowski +Date: Sun, 8 Jun 2025 21:30:44 +0200 +Subject: [PATCH] Fix build against Poppler 25.06 + +Accommodate for the private API change, whereby an array of pointers +has been replaced with a vector of unique_ptr. + +Backported from MR 7261 +https://gitlab.com/inkscape/inkscape/-/merge_requests/7261 + +Fixes https://gitlab.com/inkscape/inkscape/-/issues/5836 +--- + .../internal/pdfinput/pdf-parser.cpp | 23 +++++++++++-------- + .../pdfinput/poppler-transition-api.h | 12 ++++++++++ + 2 files changed, 25 insertions(+), 10 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 01d7bf6ef0e..0d31eda16f4 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include // std::call_once() + #include + #include +@@ -686,7 +687,6 @@ void PdfParser::opSetLineWidth(Object args[], int /*numArgs*/) + void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) + { + Object obj1, obj2, obj3, obj4, obj5; +- Function *funcs[4] = {nullptr, nullptr, nullptr, nullptr}; + GfxColor backdropColor; + GBool haveBackdropColor = gFalse; + GBool alpha = gFalse; +@@ -744,13 +744,14 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) + state->setLineWidth(obj2.getNum()); + } + ++ _POPPLER_DECLARE_TRANSFER_FUNCTION_VECTOR(funcs); ++ + // transfer function + if (_POPPLER_CALL_ARGS_DEREF(obj2, obj1.dictLookup, "TR2").isNull()) { + _POPPLER_CALL_ARGS(obj2, obj1.dictLookup, "TR"); + } + if (obj2.isName(const_cast("Default")) || obj2.isName(const_cast("Identity"))) { +- funcs[0] = funcs[1] = funcs[2] = funcs[3] = nullptr; +- state->setTransfer(funcs); ++ state->setTransfer(std::move(funcs)); + } else if (obj2.isArray() && obj2.arrayGetLength() == 4) { + int pos = 4; + for (int i = 0; i < 4; ++i) { +@@ -763,12 +764,14 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) + } + _POPPLER_FREE(obj3); + if (pos == 4) { +- state->setTransfer(funcs); ++ state->setTransfer(std::move(funcs)); + } + } else if (obj2.isName() || obj2.isDict() || obj2.isStream()) { + if ((funcs[0] = Function::parse(&obj2))) { +- funcs[1] = funcs[2] = funcs[3] = nullptr; +- state->setTransfer(funcs); ++ funcs[1] = nullptr; ++ funcs[2] = nullptr; ++ funcs[3] = nullptr; ++ state->setTransfer(std::move(funcs)); + } + } else if (!obj2.isNull()) { + error(errSyntaxError, getPos(), "Invalid transfer function in ExtGState"); +@@ -790,8 +793,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) + funcs[0] = Function::parse(&obj3); + if (funcs[0]->getInputSize() != 1 || funcs[0]->getOutputSize() != 1) { + error(errSyntaxError, getPos(), "Invalid transfer function in soft mask in ExtGState"); +- delete funcs[0]; +- funcs[0] = nullptr; ++ _POPPLER_DELETE_TRANSFER_FUNCTION(funcs[0]); + } + } + _POPPLER_FREE(obj3); +@@ -835,9 +837,10 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) + } + } + } +- doSoftMask(&obj3, alpha, blendingColorSpace.get(), isolated, knockout, funcs[0], &backdropColor); ++ doSoftMask(&obj3, alpha, blendingColorSpace.get(), isolated, knockout, ++ _POPPLER_GET_TRANSFER_FUNCTION_POINTER(funcs[0]), &backdropColor); + if (funcs[0]) { +- delete funcs[0]; ++ _POPPLER_DELETE_TRANSFER_FUNCTION(funcs[0]); + } + } else { + error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group"); +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index a67132ba6bd..d04412757bc 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -15,6 +15,18 @@ + #include + #include + ++#if POPPLER_CHECK_VERSION(25, 6, 0) ++#define _POPPLER_DECLARE_TRANSFER_FUNCTION_VECTOR(name) std::vector> name(4) ++#define _POPPLER_DELETE_TRANSFER_FUNCTION(name) name.reset() ++#define _POPPLER_GET_TRANSFER_FUNCTION_POINTER(name) name.get() ++#else ++#define _POPPLER_DECLARE_TRANSFER_FUNCTION_VECTOR(name) Function *name[4] = {} ++#define _POPPLER_DELETE_TRANSFER_FUNCTION(name) \ ++ delete name; \ ++ name = nullptr ++#define _POPPLER_GET_TRANSFER_FUNCTION_POINTER(name) name ++#endif ++ + #if POPPLER_CHECK_VERSION(25,2,0) + #define _POPPLER_GET_CODE_TO_GID_MAP(ff, len) getCodeToGIDMap(ff) + #define _POPPLER_GET_CID_TO_GID_MAP(len) getCIDToGIDMap() +-- +GitLab + diff --git a/graphics/inkscape/poppler-25.07.patch b/graphics/inkscape/poppler-25.07.patch new file mode 100644 index 0000000000..1edf744e55 --- /dev/null +++ b/graphics/inkscape/poppler-25.07.patch @@ -0,0 +1,124 @@ +From b92995c1e67129ae9965810dd5d13c9642539acd Mon Sep 17 00:00:00 2001 +From: KrIr17 +Date: Sun, 6 Jul 2025 15:42:13 +0200 +Subject: [PATCH] Fix building with Poppler 25.07.0 + +Fix building issues with + +1. [`GfxState::shift()`](https://gitlab.freedesktop.org/poppler/poppler/-/commit/71bf5552d448a6fdb666f2b61764b61ca197617d) + +2. [`FoFiTrueType::make` and `FoFiType1C::make`](FoFiTrueType::make) + +3. Fix typo from 5c4c6d116dae5250d75d34a45f0d9220824d2e20 +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- + .../pdfinput/poppler-cairo-font-engine.cpp | 16 +++++++++++----- + .../internal/pdfinput/poppler-transition-api.h | 10 ++++++++++ + 3 files changed, 22 insertions(+), 6 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index f46d12f72e5..0185d0841b9 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -2326,7 +2326,7 @@ void PdfParser::doShowText(GooString *s) { + dx, dy, ax, ay, tOriginX, tOriginY, code, n, u, uLen); + + // Move onto next unicode character. +- state->shift(tdx, tdy); ++ state->_POPPLER_TEXT_SHIFT_WITH_USER_COORDS(tdx, tdy); + p += n; + len -= n; + } +diff --git a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp +index bd1d4e49367..cfc6961f629 100644 +--- a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp ++++ b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp +@@ -316,7 +316,11 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + #endif + char **enc; + const char *name; ++#if POPPLER_CHECK_VERSION(25, 7, 0) ++ std::unique_ptr ff1c; ++#else + FoFiType1C *ff1c; ++#endif + std::optional font_face; + std::vector codeToGID; + bool substitute = false; +@@ -427,7 +431,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + FoFiTrueType *ff; + #endif + if (!font_data.empty()) { +- ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size(), 0); ++ ff = _POPPLER_FOFI_TRUETYPE_MAKE(font_data, 0); + } else { + ff = FoFiTrueType::load(fileName.c_str(), 0); + } +@@ -457,7 +461,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + FoFiTrueType *ff; + #endif + if (!font_data.empty()) { +- ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size(), 0); ++ ff = _POPPLER_FOFI_TRUETYPE_MAKE(font_data, 0); + } else { + ff = FoFiTrueType::load(fileName.c_str(), 0); + } +@@ -491,7 +495,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + case fontCIDType0C: + if (!useCIDs) { + if (!font_data.empty()) { +- ff1c = FoFiType1C::make((fontchar)font_data.data(), font_data.size()); ++ ff1c = _POPPLER_FOFI_TYPE1C_MAKE(font_data); + } else { + ff1c = FoFiType1C::load(fileName.c_str()); + } +@@ -504,7 +508,9 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + codeToGID.insert(codeToGID.begin(), src, src + n); + gfree(src); + #endif ++#if !(POPPLER_CHECK_VERSION(25, 7, 0)) + delete ff1c; ++#endif + } + } + +@@ -540,13 +546,13 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + FoFiTrueType *ff; + #endif + if (!font_data.empty()) { +- ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size(), 0); ++ ff = _POPPLER_FOFI_TRUETYPE_MAKE(font_data, 0); + } else { + ff = FoFiTrueType::load(fileName.c_str(), 0); + } + if (ff) { + if (ff->isOpenTypeCFF()) { +- auto src = ff1c->_POPPLER_GET_CID_TO_GID_MAP(&n); ++ auto src = ff->_POPPLER_GET_CID_TO_GID_MAP(&n); + #if POPPLER_CHECK_VERSION(25,2,0) + codeToGID = std::move(src); + #else +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index d04412757bc..e70d419af50 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -15,6 +15,16 @@ + #include + #include + ++#if POPPLER_CHECK_VERSION(25, 7, 0) ++#define _POPPLER_TEXT_SHIFT_WITH_USER_COORDS(dx, dy) textShiftWithUserCoords(dx, dy) ++#define _POPPLER_FOFI_TRUETYPE_MAKE(font_data, faceIndex) FoFiTrueType::make(std::span(font_data), faceIndex) ++#define _POPPLER_FOFI_TYPE1C_MAKE(font_data) FoFiType1C::make(std::span(font_data)) ++#else ++#define _POPPLER_TEXT_SHIFT_WITH_USER_COORDS(dx, dy) shift(dx, dy) ++#define _POPPLER_FOFI_TRUETYPE_MAKE(font_data, faceIndex) FoFiTrueType::make((fontchar)font_data.data(), font_data.size(), faceIndex) ++#define _POPPLER_FOFI_TYPE1C_MAKE(font_data) FoFiType1C::make((fontchar)font_data.data(), font_data.size()) ++#endif ++ + #if POPPLER_CHECK_VERSION(25, 6, 0) + #define _POPPLER_DECLARE_TRANSFER_FUNCTION_VECTOR(name) std::vector> name(4) + #define _POPPLER_DELETE_TRANSFER_FUNCTION(name) name.reset() +-- +GitLab + diff --git a/graphics/inkscape/poppler-25.09.patch b/graphics/inkscape/poppler-25.09.patch new file mode 100644 index 0000000000..3c2b71a7e2 --- /dev/null +++ b/graphics/inkscape/poppler-25.09.patch @@ -0,0 +1,109 @@ +From b60d81745016b5f20d4c6aec6d073b8a6f3e499c Mon Sep 17 00:00:00 2001 +From: mike kowalski +Date: Tue, 2 Sep 2025 07:17:25 -0700 +Subject: [PATCH] Fix build with poppler 25.09.0 + +API changes: double* -> std::array necessitates fixes in Inkscape. +The goal is to make it build with older poppler versions too. +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 3 +-- + src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp | 2 +- + src/extension/internal/pdfinput/poppler-utils.cpp | 4 ++++ + src/extension/internal/pdfinput/poppler-utils.h | 4 ++++ + src/extension/internal/pdfinput/svg-builder.cpp | 4 ++-- + 5 files changed, 12 insertions(+), 5 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 50d5e8ef8e1..1bdd0c6374c 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -1656,12 +1656,11 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading, + GfxColor color0M, color1M, colorM0, colorM1, colorMM; + GfxColor colors2[4]; + double functionColorDelta = colorDeltas[pdfFunctionShading-1]; +- const double *matrix; + double xM, yM; + int nComps, i, j; + + nComps = shading->getColorSpace()->getNComps(); +- matrix = shading->getMatrix(); ++ const auto& matrix = shading->getMatrix(); + + // compare the four corner colors + for (i = 0; i < 4; ++i) { +diff --git a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp +index cfc6961f629..986c19e1d81 100644 +--- a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp ++++ b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp +@@ -633,7 +633,7 @@ static cairo_status_t _init_type3_glyph(cairo_scaled_font_t *scaled_font, cairo_ + + info = (type3_font_info_t *)cairo_font_face_get_user_data(cairo_scaled_font_get_font_face(scaled_font), + &type3_font_key); +- const double *mat = info->font->getFontBBox(); ++ const auto& mat = info->font->getFontBBox(); + extents->ascent = mat[3]; /* y2 */ + extents->descent = -mat[3]; /* -y1 */ + extents->height = extents->ascent + extents->descent; +diff --git a/src/extension/internal/pdfinput/poppler-utils.cpp b/src/extension/internal/pdfinput/poppler-utils.cpp +index 6af37ce7f95..a50f59001bb 100644 +--- a/src/extension/internal/pdfinput/poppler-utils.cpp ++++ b/src/extension/internal/pdfinput/poppler-utils.cpp +@@ -39,6 +39,10 @@ Geom::Affine ctmToAffine(const double *ctm) + return Geom::Affine(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + } + ++Geom::Affine ctmToAffine(const std::array& ctm) { ++ return ctmToAffine(ctm.data()); ++} ++ + void ctmout(const char *label, const double *ctm) + { + std::cout << "C:" << label << ":" << ctm[0] << "," << ctm[1] << "," << ctm[2] << "," << ctm[3] << "," << ctm[4] +diff --git a/src/extension/internal/pdfinput/poppler-utils.h b/src/extension/internal/pdfinput/poppler-utils.h +index 705665a8cd6..55c7ae4da54 100644 +--- a/src/extension/internal/pdfinput/poppler-utils.h ++++ b/src/extension/internal/pdfinput/poppler-utils.h +@@ -13,6 +13,7 @@ + #ifndef POPPLER_UTILS_H + #define POPPLER_UTILS_H + ++#include + #include + #include + #include +@@ -36,7 +37,10 @@ class Ref; + class XRef; + + Geom::Affine stateToAffine(GfxState *state); ++// this function is for Poppler older than v25.09.0 + Geom::Affine ctmToAffine(const double *ctm); ++// this flavor is for Poppler v25.09.0 and above ++Geom::Affine ctmToAffine(const std::array& ctm); + + void ctmout(const char *label, const double *ctm); + void affout(const char *label, Geom::Affine affine); +diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp +index d612602738f..fbc39653c38 100644 +--- a/src/extension/internal/pdfinput/svg-builder.cpp ++++ b/src/extension/internal/pdfinput/svg-builder.cpp +@@ -1136,7 +1136,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern, + pattern_node->setAttribute("patternUnits", "userSpaceOnUse"); + // Set pattern tiling + // FIXME: don't ignore XStep and YStep +- const double *bbox = tiling_pattern->getBBox(); ++ const auto& bbox = tiling_pattern->getBBox(); + pattern_node->setAttributeSvgDouble("x", 0.0); + pattern_node->setAttributeSvgDouble("y", 0.0); + pattern_node->setAttributeSvgDouble("width", bbox[2] - bbox[0]); +@@ -1367,7 +1367,7 @@ void SvgBuilder::updateFont(GfxState *state, std::shared_ptr cairo_fo + + auto new_font_size = state->getFontSize(); + if (font->getType() == fontType3) { +- const double *font_matrix = font->getFontMatrix(); ++ const auto& font_matrix = font->getFontMatrix(); + if (font_matrix[0] != 0.0) { + new_font_size *= font_matrix[3] / font_matrix[0]; + } +-- +GitLab + diff --git a/graphics/kColorPicker/README b/graphics/kColorPicker/README deleted file mode 100644 index a0dc172eb6..0000000000 --- a/graphics/kColorPicker/README +++ /dev/null @@ -1,5 +0,0 @@ -kColorPicker (Qt based Color Picker with popup menu) - -QToolButton with color popup menu which lets you select a color. -The popup features a color dialog button which can be used to -add custom colors to the popup menu. diff --git a/graphics/kColorPicker/kColorPicker.SlackBuild b/graphics/kColorPicker/kColorPicker.SlackBuild deleted file mode 100644 index 8736763cdc..0000000000 --- a/graphics/kColorPicker/kColorPicker.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# -# Slackware build script for kColorPicker -# -# Copyright 2022 Alexander Schultz -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=kColorPicker -VERSION=${VERSION:-0.1.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKCOV_INSTALL_MANDIR=/usr/man \ - -DKCOV_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - -DBUILD_SHARED_LIBS=ON .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/graphics/kColorPicker/kColorPicker.info b/graphics/kColorPicker/kColorPicker.info deleted file mode 100644 index 2e6859a082..0000000000 --- a/graphics/kColorPicker/kColorPicker.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kColorPicker" -VERSION="0.1.6" -HOMEPAGE="https://github.com/ksnip/kColorPicker" -DOWNLOAD="https://github.com/ksnip/kColorPicker/archive/refs/tags/v0.1.6/kColorPicker-0.1.6.tar.gz" -MD5SUM="2a4e536cf7d947689d9a5e3cdef58837" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Alexander Schultz" -EMAIL="alexander_schultz@posteo.se" diff --git a/graphics/kColorPicker/slack-desc b/graphics/kColorPicker/slack-desc deleted file mode 100644 index c375029bab..0000000000 --- a/graphics/kColorPicker/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -kColorPicker: kColorPicker (Qt based Color Picker with popup menu) -kColorPicker: -kColorPicker: QToolButton with color popup menu which lets you select a color. -kColorPicker: The popup features a color dialog button which can be used -kColorPicker: to add custom colors to the popup menu. -kColorPicker: -kColorPicker: Homepage: https://github.com/ksnip/kColorPicker -kColorPicker: -kColorPicker: -kColorPicker: -kColorPicker: diff --git a/graphics/kImageAnnotator/README b/graphics/kImageAnnotator/README deleted file mode 100644 index 535210789e..0000000000 --- a/graphics/kImageAnnotator/README +++ /dev/null @@ -1,3 +0,0 @@ -kImageAnnotator (Tool for annotating images) - -Tool for annotating images. diff --git a/graphics/kImageAnnotator/kImageAnnotator.SlackBuild b/graphics/kImageAnnotator/kImageAnnotator.SlackBuild deleted file mode 100644 index a6ec4e9a45..0000000000 --- a/graphics/kImageAnnotator/kImageAnnotator.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# -# Slackware build script for kImageAnnotator -# -# Copyright 2022 Alexander Schultz -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=kImageAnnotator -VERSION=${VERSION:-0.5.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKCOV_INSTALL_MANDIR=/usr/man \ - -DKCOV_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - -DBUILD_SHARED_LIBS=ON .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/graphics/kImageAnnotator/kImageAnnotator.info b/graphics/kImageAnnotator/kImageAnnotator.info deleted file mode 100644 index caba0227ff..0000000000 --- a/graphics/kImageAnnotator/kImageAnnotator.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kImageAnnotator" -VERSION="0.5.3" -HOMEPAGE="https://github.com/ksnip/kImageAnnotator" -DOWNLOAD="https://github.com/ksnip/kImageAnnotator/archive/refs/tags/v0.5.3/kImageAnnotator-0.5.3.tar.gz" -MD5SUM="992390460ab4e10b967bed11f8558250" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="kColorPicker" -MAINTAINER="Alexander Schultz" -EMAIL="alexander_schultz@posteo.se" diff --git a/graphics/kImageAnnotator/slack-desc b/graphics/kImageAnnotator/slack-desc deleted file mode 100644 index 30f29d40bb..0000000000 --- a/graphics/kImageAnnotator/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -kImageAnnotator: kImageAnnotator (Tool for annotating images) -kImageAnnotator: -kImageAnnotator: Tool for annotating images -kImageAnnotator: -kImageAnnotator: Homepage: https://github.com/ksnip/kImageAnnotator -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: diff --git a/graphics/kuickshow/kuickshow.SlackBuild b/graphics/kuickshow/kuickshow.SlackBuild index d06717ad00..362c41ed03 100644 --- a/graphics/kuickshow/kuickshow.SlackBuild +++ b/graphics/kuickshow/kuickshow.SlackBuild @@ -78,6 +78,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# workaround for https://bugs.gentoo.org/919504 +sed -i "s|\${libImlib_CFLAGS}||" cmake/modules/FindIMLIB.cmake + mkdir -p build cd build cmake \ diff --git a/graphics/lensfun03/lensfun03.SlackBuild b/graphics/lensfun03/lensfun03.SlackBuild index d0e56962c9..150d1649a7 100644 --- a/graphics/lensfun03/lensfun03.SlackBuild +++ b/graphics/lensfun03/lensfun03.SlackBuild @@ -101,6 +101,7 @@ cd cmake-build -DBUILD_FOR_SSE2=ON \ -DBUILD_TESTS=OFF \ -DINSTALL_HELPER_SCRIPTS=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ .. make make install DESTDIR=$PKG diff --git a/graphics/libplacebo/README b/graphics/libplacebo/README deleted file mode 100644 index eff104786c..0000000000 --- a/graphics/libplacebo/README +++ /dev/null @@ -1,3 +0,0 @@ -libplacebo is essentially the core rendering algorithms and ideas of mpv -turned into a library. - diff --git a/graphics/libplacebo/libplacebo.SlackBuild b/graphics/libplacebo/libplacebo.SlackBuild deleted file mode 100644 index 3b776ba73b..0000000000 --- a/graphics/libplacebo/libplacebo.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -# Slackware build script for libplacebo - -# Copyright 2019-2020 Hunter Sezen California, USA -# Copyright 2023,24 Christoph Willing Sydney, Australia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libplacebo -VERSION=${VERSION:-7.349.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-v$VERSION -tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz -cd $PRGNAM-v$VERSION -patch -p0 < $CWD/use_meson-0.59.4.diff -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -if [ "${DEBUG:=0}" != 0 ]; then - NDEBUG=false - RELEASE=debug - SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')" -else - NDEBUG=true - RELEASE=plain -fi - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages/ - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -meson \ - --prefix=/usr \ - --libdir=lib${LIBDIRSUFFIX} \ - -Dstrip=$NDEBUG \ - -Db_ndebug=$NDEBUG \ - -Dbuildtype=$RELEASE \ - -Ddemos=false \ - build - -"${NINJA:=ninja}" -C build -DESTDIR=$PKG "$NINJA" -C build install - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/graphics/libplacebo/libplacebo.info b/graphics/libplacebo/libplacebo.info deleted file mode 100644 index 977266995e..0000000000 --- a/graphics/libplacebo/libplacebo.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libplacebo" -VERSION="7.349.0" -HOMEPAGE="https://code.videolan.org/videolan/libplacebo" -DOWNLOAD="https://code.videolan.org/videolan/libplacebo/-/archive/v7.349.0/libplacebo-v7.349.0.tar.gz" -MD5SUM="9b1d0d96793dfa883ed6ac70f7f871d1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-meson-opt python3-glad" -MAINTAINER="Christoph Willing" -EMAIL="chris.willing@linux.com" diff --git a/graphics/libplacebo/slack-desc b/graphics/libplacebo/slack-desc deleted file mode 100644 index cdb54a9292..0000000000 --- a/graphics/libplacebo/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libplacebo: libplacebo (GPU-accelerated video/image rendering primitives library) -libplacebo: -libplacebo: libplacebo is essentially the core rendering algorithms and ideas of -libplacebo: mpv turned into a library. -libplacebo: -libplacebo: Homepage: https://code.videolan.org/videolan/libplacebo -libplacebo: -libplacebo: -libplacebo: -libplacebo: -libplacebo: diff --git a/graphics/libplacebo/use_meson-0.59.4.diff b/graphics/libplacebo/use_meson-0.59.4.diff deleted file mode 100644 index 3c1c83ebde..0000000000 --- a/graphics/libplacebo/use_meson-0.59.4.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- meson.build.orig 2023-03-24 00:53:00.000000000 +1000 -+++ meson.build 2023-08-23 10:52:45.189000000 +1000 -@@ -6,7 +6,7 @@ - 'c_std=c11', - 'cpp_std=c++11', - ], -- meson_version: '>=0.63', -+ meson_version: '>=0.59.4', - version: '@0@.@1@.@2@'.format( - # Major version - 5, diff --git a/graphics/luminance-hdr/luminance-hdr.SlackBuild b/graphics/luminance-hdr/luminance-hdr.SlackBuild index 027d2b07ea..85006e549b 100644 --- a/graphics/luminance-hdr/luminance-hdr.SlackBuild +++ b/graphics/luminance-hdr/luminance-hdr.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=luminance-hdr -VERSION=${VERSION:-2.6.0} +VERSION=${VERSION:-2.6.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,10 +80,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +# Apply patches from gentoo +for i in $CWD/patches/* ; do patch -p1 < $i ; done + # Workround build failure with gcc-g++-4.9.3 and beyond (mangling bug?) # (fails to link libmvec: "undefined reference to `_ZGVbN4vv_powf'" etc) export CXX=clang++ +# Fix for boost >= 1.85.0 +sed -i \ + '/constants\/constants/i #include ' \ + src/Libpfs/manip/resize.hxx + # 20220320 bkw: for some reason, the -latomic is needed on 32-bit x86. # it does no harm on x86_64. mkdir -p build diff --git a/graphics/luminance-hdr/luminance-hdr.info b/graphics/luminance-hdr/luminance-hdr.info index cc84ef4b63..6151b43135 100644 --- a/graphics/luminance-hdr/luminance-hdr.info +++ b/graphics/luminance-hdr/luminance-hdr.info @@ -1,8 +1,8 @@ PRGNAM="luminance-hdr" -VERSION="2.6.0" +VERSION="2.6.1.1" HOMEPAGE="http://qtpfsgui.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/qtpfsgui/2.6.0/luminance-hdr-2.6.0.tar.bz2" -MD5SUM="9ac2be847d304f0ddc7089b251825c4d" +DOWNLOAD="http://downloads.sf.net/qtpfsgui/luminance-hdr-2.6.1.1.tar.bz2" +MD5SUM="c57baf1d3c5d7952f952496f20f86c8f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.5.1-openmp-automagic.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.5.1-openmp-automagic.patch new file mode 100644 index 0000000000..f0399d271a --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.5.1-openmp-automagic.patch @@ -0,0 +1,32 @@ +diff --git a/build_files/Modules/CompilerSettings.cmake b/build_files/Modules/CompilerSettings.cmake +index f55c130..81e1916 100644 +--- a/build_files/Modules/CompilerSettings.cmake ++++ b/build_files/Modules/CompilerSettings.cmake +@@ -45,16 +45,19 @@ else() + message(WARNING "Your C++ compiler does not support C++11.") + endif() + #OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3 +-IF(MSVC) +- FIND_PACKAGE(OpenMP REQUIRED) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +-ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) +- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) +- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) +- MESSAGE(STATUS "GCC >= 4.3") ++OPTION(USE_OPENMP "Use openmp threading support." ON) ++IF(USE_OPENMP) ++ IF(MSVC) + FIND_PACKAGE(OpenMP REQUIRED) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) ++ MESSAGE(STATUS "GCC >= 4.3") ++ FIND_PACKAGE(OpenMP REQUIRED) ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ ENDIF() + ENDIF() + ENDIF() diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-cmake.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-cmake.patch new file mode 100644 index 0000000000..5564ebadc9 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-cmake.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:53:19.496802424 +0200 +@@ -5,19 +5,6 @@ + CMAKE_POLICY(SET CMP0053 NEW) + PROJECT("Luminance HDR") + +-string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE) +-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(debug|release|relwithdebinfo|minsizerel)$") +- message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +-else() +- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n" +- "CMAKE_BUILD_TYPE should be one of:\nDebug, Release, RelWithDebInfo, MinSizeRel") +-endif() +- +-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(release|minsizerel)$") +- message(STATUS "Adding definitions: -DQT_NO_DEBUG_OUTPUT") +- add_definitions("-DQT_NO_DEBUG_OUTPUT") +-endif() +- + # assume built-in pthreads on MacOS + IF(APPLE) + enable_language(CXX) diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-docs.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-docs.patch new file mode 100644 index 0000000000..982c7ebfac --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-docs.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:43:41.005292354 +0200 +@@ -413,12 +413,6 @@ + INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon + INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.desktop DESTINATION share/applications) #desktop entry + INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.appdata.xml DESTINATION share/appdata) #appstream +- INSTALL(FILES +- ${CMAKE_SOURCE_DIR}/AUTHORS +- ${CMAKE_SOURCE_DIR}/README.md +- ${CMAKE_SOURCE_DIR}/LICENSE +- ${CMAKE_SOURCE_DIR}/Changelog +- DESTINATION share/luminance-hdr/doc) #info files + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory + # Microsoft Windows diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-no-git.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-no-git.patch new file mode 100644 index 0000000000..1d95930404 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-no-git.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:41:24.684413834 +0200 +@@ -103,11 +103,7 @@ + set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES}) + endif() + +-FIND_PACKAGE(Git) +-IF(GIT_FOUND) +- include(GetGitRevisionDescription) +- get_git_head_revision(GIT_REFSPEC GIT_SHA1) +-ENDIF() ++SET(GIT_SHA1 "-- Slackware build --") + + IF(WIN32) + diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-exiv-0.28.x.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-exiv-0.28.x.patch new file mode 100644 index 0000000000..d5c1289e0a --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-exiv-0.28.x.patch @@ -0,0 +1,191 @@ +Description: Fix build with >=exiv2-0.28.0, raise minimum to 0.27.0 + - enables use of EXIV2_TEST_VERSION macro + - add compatibility for exiv2-0.28 +Author: Robert-André Mauchin +Origin: upstream, https://github.com/LuminanceHDR/LuminanceHDR/commit/e5ebd48fac2de33f4990f530c68dd4c9d8fc3829 +Last-Update: 2024-02-25 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -180,7 +180,7 @@ ENDIF() + FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options thread chrono system date_time) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) + +-FIND_PACKAGE(Exiv2 REQUIRED) ++FIND_PACKAGE(Exiv2 REQUIRED 0.27.0) + INCLUDE_DIRECTORIES(${EXIV2_INCLUDE_DIR} "${EXIV2_INCLUDE_DIR}/exiv2") + + FIND_PACKAGE(TIFF REQUIRED) +--- a/src/Exif/ExifOperations.cpp ++++ b/src/Exif/ExifOperations.cpp +@@ -42,6 +42,14 @@ + #include "ExifOperations.h" + #include "arch/math.h" + ++#if EXIV2_TEST_VERSION(0,28,0) ++typedef Exiv2::Error Exiv2Error; ++typedef Exiv2::Image::UniquePtr ImagePtr; ++#else ++typedef Exiv2::AnyError Exiv2Error; ++typedef Exiv2::Image::AutoPtr ImagePtr; ++#endif ++ + using namespace boost; + using namespace boost::assign; + +@@ -108,7 +116,7 @@ void copyExifData(const std::string &fro + #endif + + try { +- Exiv2::Image::AutoPtr sourceImage; ++ ImagePtr sourceImage; + Exiv2::ExifData srcExifData; + + if (!from.empty()) { +@@ -128,7 +136,7 @@ void copyExifData(const std::string &fro + } + + // get destination exif data +- Exiv2::Image::AutoPtr destinationImage = Exiv2::ImageFactory::open(to); ++ ImagePtr destinationImage = Exiv2::ImageFactory::open(to); + + if (dontOverwrite) { + // doesn't throw anything if it is empty +@@ -212,7 +220,7 @@ void copyExifData(const std::string &fro + destinationImage->setExifData(srcExifData); + } + destinationImage->writeMetadata(); +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2Error &e) { + #ifndef NDEBUG + qDebug() << e.what(); + #endif +@@ -250,7 +258,7 @@ float obtain_avg_lum(const std::string& + { + try + { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ ImagePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + Exiv2::ExifData &exifData = image->exifData(); + if (exifData.empty()) +@@ -329,7 +337,7 @@ allowed for ev computation purposes. + return -1; + } + } +- catch (Exiv2::AnyError& e) ++ catch (Exiv2Error& e) + { + return -1; + } +@@ -338,7 +346,7 @@ allowed for ev computation purposes. + + float getExposureTime(const std::string &filename) { + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ ImagePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + Exiv2::ExifData &exifData = image->exifData(); + if (exifData.empty()) return -1; +@@ -374,14 +382,14 @@ float getExposureTime(const std::string + } else { + return -1; + } +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2Error &e) { + return -1; + } + } + + float getAverageLuminance(const std::string &filename) { + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ ImagePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + Exiv2::ExifData &exifData = image->exifData(); + +@@ -403,7 +411,7 @@ float getAverageLuminance(const std::str + << std::endl; + + return -1.0; +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2Error &e) { + return -1.0; + } + } +--- a/src/Libpfs/exif/exifdata.cpp ++++ b/src/Libpfs/exif/exifdata.cpp +@@ -25,6 +25,16 @@ + #include + #include + ++#if EXIV2_TEST_VERSION(0,28,0) ++typedef Exiv2::Error Exiv2Error; ++typedef Exiv2::Image::UniquePtr ImagePtr; ++#define EXIV2_TO_INT toInt64 ++#else ++typedef Exiv2::AnyError Exiv2Error; ++typedef Exiv2::Image::AutoPtr ImagePtr; ++#define EXIV2_TO_INT toLong ++#endif ++ + namespace pfs { + namespace exif { + +@@ -52,7 +62,7 @@ ExifData::ExifData(const std::string &fi + void ExifData::fromFile(const std::string &filename) { + reset(); + try { +- ::Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ ::ImagePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + ::Exiv2::ExifData &exifData = image->exifData(); + +@@ -121,7 +131,7 @@ void ExifData::fromFile(const std::strin + */ + if ((it = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) != + exifData.end()) { +- long rotation = it->toLong(); ++ long rotation = it->EXIV2_TO_INT(); + switch (rotation) { + case 3: + m_orientation = 180; +@@ -134,7 +144,7 @@ void ExifData::fromFile(const std::strin + break; + } + } +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2Error &e) { + return; + } + } +--- a/src/TransplantExif/TransplantExifDialog.cpp ++++ b/src/TransplantExif/TransplantExifDialog.cpp +@@ -27,14 +27,11 @@ + #include + #include + #include +-// Make sure an EXIV2_TEST_VERSION macro exists: +-#ifdef EXIV2_VERSION +-# ifndef EXIV2_TEST_VERSION +-# define EXIV2_TEST_VERSION(major,minor,patch) \ +- ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) +-# endif ++ ++#if EXIV2_TEST_VERSION(0,28,0) ++typedef Exiv2::Error Exiv2Error; + #else +-# define EXIV2_TEST_VERSION(major,minor,patch) (false) ++typedef Exiv2::AnyError Exiv2Error; + #endif + + #include "Common/config.h" +@@ -347,7 +344,7 @@ void TransplantExifDialog::transplant_re + QFile::encodeName((*i_dest)).constData(), + m_Ui->checkBox_dont_overwrite->isChecked()); + m_Ui->rightlist->item(index)->setBackground(QBrush("#a0ff87")); +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2Error &e) { + add_log_message("ERROR:" + QString::fromStdString(e.what())); + m_Ui->rightlist->item(index)->setBackground(QBrush("#ff743d")); + } diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-fixheaders.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-fixheaders.patch new file mode 100644 index 0000000000..58974ea998 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-fixheaders.patch @@ -0,0 +1,15 @@ +Source: arch linux + +diff --git a/src/Common/init_fftw.h b/src/Common/init_fftw.h +index af2fc02c..a4aad47f 100644 +--- a/src/Common/init_fftw.h ++++ b/src/Common/init_fftw.h +@@ -22,7 +22,7 @@ + #ifndef INIT_FFTW_H + #define INIT_FFTW_H + +-#include ++#include + + class FFTW_MUTEX { + public: diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-openexr3.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-openexr3.patch new file mode 100644 index 0000000000..9ab2832987 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-openexr3.patch @@ -0,0 +1,28 @@ +Source: arch linux + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ff498d0..23f5c387 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,7 +191,7 @@ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) + FIND_PACKAGE(PNG REQUIRED) + INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + +-FIND_PACKAGE(OpenEXR REQUIRED) ++FIND_PACKAGE(OpenEXR CONFIG REQUIRED) + INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR") + + FIND_PACKAGE(GSL REQUIRED) +diff --git a/src/Libpfs/CMakeLists.txt b/src/Libpfs/CMakeLists.txt +index 80617998..ce3c746e 100644 +--- a/src/Libpfs/CMakeLists.txt ++++ b/src/Libpfs/CMakeLists.txt +@@ -12,7 +12,7 @@ ADD_SUBDIRECTORY(colorspace) + ADD_SUBDIRECTORY(io) + + ADD_LIBRARY(pfs STATIC ${LIBPFS_H} ${LIBPFS_HXX} ${LIBPFS_CPP}) +-TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets) ++TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets OpenEXR::OpenEXR) + + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfs PARENT_SCOPE) + SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfs PARENT_SCOPE) diff --git a/graphics/maim/maim.SlackBuild b/graphics/maim/maim.SlackBuild index 3431bdb804..ac798617c5 100644 --- a/graphics/maim/maim.SlackBuild +++ b/graphics/maim/maim.SlackBuild @@ -66,7 +66,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -cmake -DCMAKE_INSTALL_PREFIX="/usr/" -DCMAKE_INSTALL_MANDIR="/usr/man/" ./ +# This is needed with the newer icu: thanks to perrin4869 on LQ! +sed -i "s|CXX_STANDARD\ 11|CXX_STANDARD\ 17|" CMakeLists.txt + +# Fix for cmake >= 4.x, thanks to Ivan Kovmir! +cmake -DCMAKE_INSTALL_PREFIX="/usr/" -DCMAKE_INSTALL_MANDIR="/usr/man/" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -Wno-dev ./ make make install DESTDIR=$PKG diff --git a/graphics/mypaint/032a155.patch b/graphics/mypaint/032a155.patch new file mode 100644 index 0000000000..7c2df6effd --- /dev/null +++ b/graphics/mypaint/032a155.patch @@ -0,0 +1,98 @@ +From 032a155b72f2b021f66a994050d83f07342d04af Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + +Date: Wed, 9 Nov 2022 11:24:33 +0700 +Subject: [PATCH] python: fix for Python 3.11 + +- python 3 always open in universal mode, U is default mode in 3.0, + and removed in 3.11 +- mypaint doesn't use ld?n?gettext, so bind_textdomain_codeset isn't + needed, that function is deprecated in 3.8 and is no-ops in 3.10 and + removed in 3.11 +--- + lib/gettext_setup.py | 25 ++----------------------- + setup.py | 2 +- + 2 files changed, 3 insertions(+), 24 deletions(-) + +diff --git a/lib/gettext_setup.py b/lib/gettext_setup.py +index d4ce60a20..72cfaeddc 100644 +--- a/lib/gettext_setup.py ++++ b/lib/gettext_setup.py +@@ -82,13 +82,11 @@ def init_gettext(localepath): + # yanked in over GI. + # https://bugzilla.gnome.org/show_bug.cgi?id=574520#c26 + bindtextdomain = None +- bind_textdomain_codeset = None + textdomain = None + + # Try the POSIX/Linux way first. + try: + bindtextdomain = locale.bindtextdomain +- bind_textdomain_codeset = locale.bind_textdomain_codeset + textdomain = locale.textdomain + except AttributeError: + logger.warning( +@@ -117,12 +115,6 @@ def init_gettext(localepath): + ctypes.c_char_p, + ) + bindtextdomain.restype = ctypes.c_char_p +- bind_textdomain_codeset = libintl.bind_textdomain_codeset +- bind_textdomain_codeset.argtypes = ( +- ctypes.c_char_p, +- ctypes.c_char_p, +- ) +- bind_textdomain_codeset.restype = ctypes.c_char_p + textdomain = libintl.textdomain + textdomain.argtypes = ( + ctypes.c_char_p, +@@ -177,35 +169,22 @@ def init_gettext(localepath): + # complete set from the same source. + # Required for translatable strings in GtkBuilder XML + # to be translated. +- if bindtextdomain and bind_textdomain_codeset and textdomain: ++ if bindtextdomain and textdomain: + assert os.path.exists(path) + assert os.path.isdir(path) + if sys.platform == 'win32': + p = bindtextdomain(dom.encode('utf-8'), path.encode('utf-8')) +- c = bind_textdomain_codeset( +- dom.encode('utf-8'), codeset.encode('utf-8') +- ) + else: + p = bindtextdomain(dom, path) +- c = bind_textdomain_codeset(dom, codeset) + logger.debug("C bindtextdomain(%r, %r): %r", dom, path, p) +- logger.debug( +- "C bind_textdomain_codeset(%r, %r): %r", +- dom, codeset, c, +- ) + # Call the implementations in Python's standard gettext module + # too. This has proper cross-platform support, but it only + # initializes the native Python "gettext" module. + # Required for marked strings in Python source to be translated. + # See http://docs.python.org/release/2.7/library/locale.html + p = gettext.bindtextdomain(dom, path) +- c = gettext.bind_textdomain_codeset(dom, codeset) + logger.debug("Python bindtextdomain(%r, %r): %r", dom, path, p) +- logger.debug( +- "Python bind_textdomain_codeset(%r, %r): %r", +- dom, codeset, c, +- ) +- if bindtextdomain and bind_textdomain_codeset and textdomain: ++ if bindtextdomain and textdomain: + if sys.platform == 'win32': + d = textdomain(defaultdom.encode('utf-8')) + else: +diff --git a/setup.py b/setup.py +index 204236765..046db5880 100644 +--- a/setup.py ++++ b/setup.py +@@ -679,7 +679,7 @@ def _install_script(self, src, header): + self.announce("installing %s as %s" % (src, targ_basename), level=2) + if self.dry_run: + return [] +- with open(src, "rU") as in_fp: ++ with open(src, "r") as in_fp: + with open(targ, "w") as out_fp: + line = in_fp.readline().rstrip() + if line.startswith("#!"): diff --git a/graphics/mypaint/3b682d5.patch b/graphics/mypaint/3b682d5.patch new file mode 100644 index 0000000000..b031bbe6e9 --- /dev/null +++ b/graphics/mypaint/3b682d5.patch @@ -0,0 +1,49 @@ +From 3b682d5898f4a6b709a2cd1a4d2b1b9288277cd6 Mon Sep 17 00:00:00 2001 +From: insane +Date: Thu, 3 Apr 2025 03:14:39 -0500 +Subject: [PATCH] Fix pyobject enums in pygobject >= 3.51.0 + +Co-authored-by: N.F. + +Fix AttributeError: 'UserDirectory' object has no attribute 'value_name' + +k.value_name was resulting in attribute error. +Changing it to k.name resolves it. + +Background information below. + +Unregistered pygobject enums in v3.51.0 released on 2025-02-01 are now +stdlib enums. + +From the NEWS file: +> Note: Only enumerations and flags that have a GType associated will +> have the GEnum extra properties, such as +> `value_nicks` and `value_names`. + +Further down: +> * Use standard `enum` module for enums and flags in +> PyGObject :mr:`394` + +Reference: +https://github.com/mypaint/mypaint/issues/1292 +https://gitlab.gnome.org/GNOME/pygobject/-/blob/1c675e47a160662e5247a387dcd35e0d36b3c4d2/NEWS#L32 +https://gitlab.gnome.org/GNOME/pygobject/-/merge_requests/394 + +Closes #1292 +--- + lib/glib.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/glib.py b/lib/glib.py +index 5d4eef16c..865ec86ae 100644 +--- a/lib/glib.py ++++ b/lib/glib.py +@@ -190,7 +190,7 @@ def init_user_dir_caches(): + k = GLib.UserDirectory(i) + logger.debug( + "Init g_get_user_special_dir(%s): %r", +- k.value_name, ++ k.name, + get_user_special_dir(k), + ) + diff --git a/graphics/mypaint/mypaint.SlackBuild b/graphics/mypaint/mypaint.SlackBuild index 8335dd8bee..de0d9f5036 100644 --- a/graphics/mypaint/mypaint.SlackBuild +++ b/graphics/mypaint/mypaint.SlackBuild @@ -68,6 +68,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Upstream fixes for python >= 3.11 +patch -p1 < $CWD/032a155.patch +patch -p1 < $CWD/3b682d5.patch + python3 setup.py build python3 setup.py install --prefix=/usr --root=$PKG diff --git a/graphics/nomacs/nomacs.SlackBuild b/graphics/nomacs/nomacs.SlackBuild index 54e559d3d0..ab13c04693 100644 --- a/graphics/nomacs/nomacs.SlackBuild +++ b/graphics/nomacs/nomacs.SlackBuild @@ -102,6 +102,7 @@ cd build -DENABLE_QUAZIP=1 \ -DUSE_SYSTEM_QUAZIP=1 \ -DENABLE_TRANSLATIONS=1 \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/graphics/nvidia-texture-tools/nvidia-texture-tools.SlackBuild b/graphics/nvidia-texture-tools/nvidia-texture-tools.SlackBuild index 6157b313e3..2b59c1722c 100644 --- a/graphics/nvidia-texture-tools/nvidia-texture-tools.SlackBuild +++ b/graphics/nvidia-texture-tools/nvidia-texture-tools.SlackBuild @@ -91,6 +91,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DNVTT_SHARED=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/graphics/opencollada/opencollada.SlackBuild b/graphics/opencollada/opencollada.SlackBuild index a1f0efc246..7f93df64e2 100644 --- a/graphics/opencollada/opencollada.SlackBuild +++ b/graphics/opencollada/opencollada.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for opencollada -# Copyright 2015-2023 Christoph Willing, Brisbane Australia +# Copyright 2015-2025 Christoph Willing, Brisbane Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -86,6 +83,11 @@ patch -p0 < $CWD/no_werror.diff sed -i -e '/#include "Macros.h"/i #include ' DAEValidator/library/src/DaeValidator.cpp sed -i -e '/#include "Macros.h"/i #include ' DAEValidator/library/src/XmlDoc.cpp +# CMAKE_POLICY_VERSION_MINIMUM=3.5 needed for -current only +if [ ! -x /usr/bin/gcc-11.* ]; then + export CMAKE_POLICY_VERSION_MINIMUM=3.5 +fi + mkdir -p build cd build cmake ../ \ diff --git a/graphics/opencolorio/opencolorio.SlackBuild b/graphics/opencolorio/opencolorio.SlackBuild index c077a017e0..15240d640e 100644 --- a/graphics/opencolorio/opencolorio.SlackBuild +++ b/graphics/opencolorio/opencolorio.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=opencolorio SRCNAM=OpenColorIO -VERSION=${VERSION:-2.2.1} +VERSION=${VERSION:-2.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -87,6 +87,11 @@ SLKCFLAGS+=" -msse2" sed -i '/StringUtils.h/a #include ' src/OpenColorIO/FileRules.cpp +if [ ! -x /usr/bin/gcc-11.* ]; then + echo "CMAKE_POLICY_VERSION_MINIMUM=3.5 for -current" + export CMAKE_POLICY_VERSION_MINIMUM=3.5 +fi + mkdir -p build cd build cmake \ diff --git a/graphics/opencolorio/opencolorio.info b/graphics/opencolorio/opencolorio.info index 61fd902364..b7163e700a 100644 --- a/graphics/opencolorio/opencolorio.info +++ b/graphics/opencolorio/opencolorio.info @@ -1,8 +1,8 @@ PRGNAM="opencolorio" -VERSION="2.2.1" +VERSION="2.4.2" HOMEPAGE="http://opencolorio.org/" -DOWNLOAD="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v2.2.1/OpenColorIO-2.2.1.tar.gz" -MD5SUM="372d6982cf01818a21a12f9628701a91" +DOWNLOAD="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v2.4.2/OpenColorIO-2.4.2.tar.gz" +MD5SUM="db64ac0b4a67fd8e6d6d8111dccade29" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pybind11 yaml-cpp" diff --git a/graphics/openimageio/doinst.sh b/graphics/openimageio/doinst.sh new file mode 100644 index 0000000000..67a9f6f9cf --- /dev/null +++ b/graphics/openimageio/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f +fi diff --git a/graphics/openimageio/openimageio.SlackBuild b/graphics/openimageio/openimageio.SlackBuild index 58ffc36f43..c736c3e7f9 100644 --- a/graphics/openimageio/openimageio.SlackBuild +++ b/graphics/openimageio/openimageio.SlackBuild @@ -26,8 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=openimageio SRCNAM=OpenImageIO -VERSION=${VERSION:-2.5.18.0} -FMT=${FMT:-"fmt-7.1.3"} +VERSION=${VERSION:-3.0.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -65,16 +64,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION - -# Use private fmt -mkdir -p ext -cd ext -tar xf $CWD/${FMT}.tar.gz -ln -s $FMT fmt -cd .. - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -89,7 +80,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++14 -fcommon" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_FMT_FORCE:BOOL=TRUE \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DPYLIB_INCLUDE_SONAME:BOOL=TRUE \ -DPYLIB_LIB_PREFIX:BOOL=FALSE \ -DUSE_OPENJPEG:BOOL=TRUE \ @@ -110,6 +101,7 @@ 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 diff --git a/graphics/openimageio/openimageio.info b/graphics/openimageio/openimageio.info index 8d8ae34eee..16fd3f2534 100644 --- a/graphics/openimageio/openimageio.info +++ b/graphics/openimageio/openimageio.info @@ -1,10 +1,8 @@ PRGNAM="openimageio" -VERSION="2.5.18.0" +VERSION="3.0.7.0" HOMEPAGE="https://sites.google.com/site/openimageio/home" -DOWNLOAD="https://github.com/OpenImageIO/oiio/archive/v2.5.18.0/OpenImageIO-2.5.18.0.tar.gz \ - https://github.com/fmtlib/fmt/archive/7.1.3/fmt-7.1.3.tar.gz" -MD5SUM="3975e5dc0970ad859244a58dc2b8e147 \ - 2522ec65070c0bda0ca288677ded2831" +DOWNLOAD="https://github.com/OpenImageIO/oiio/archive/v3.0.7.0/OpenImageIO-3.0.7.0.tar.gz" +MD5SUM="e160325df30205066e53a8aab0c4b193" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="dcmtk hdf5 opencolorio ptex robin-map tbb" diff --git a/graphics/rawtherapee/jpeg_turbo_3.0.3.patch b/graphics/rawtherapee/jpeg_turbo_3.0.3.patch new file mode 100644 index 0000000000..4dd964860d --- /dev/null +++ b/graphics/rawtherapee/jpeg_turbo_3.0.3.patch @@ -0,0 +1,89 @@ +From efdc5bce3b9794847093baeb040937ab55eba86e Mon Sep 17 00:00:00 2001 +From: Richard E Barber +Date: Sun, 19 May 2024 04:27:10 -0700 +Subject: [PATCH 1/2] Fix linking with jpeg-turbo + +patch via Termux PR +https://github.com/termux-user-repository/tur/pull/1027 +--- + rtengine/jdatasrc.cc | 28 ++-------------------------- + 1 file changed, 2 insertions(+), 26 deletions(-) + +diff --git a/rtengine/jdatasrc.cc b/rtengine/jdatasrc.cc +index fa13b9dd13..a0d12657f2 100644 +--- a/rtengine/jdatasrc.cc ++++ b/rtengine/jdatasrc.cc +@@ -247,20 +247,6 @@ my_error_exit (j_common_ptr cinfo) + #endif + } + +- +-#ifdef _WIN32 +-#define JVERSION "6b 27-Mar-1998" +-#define JCOPYRIGHT_SHORT "(C) 1998, Thomas G. Lane" +-#define JMESSAGE(code,string) string , +- +-const char * const jpeg_std_message_table[] = { +-#include "jerror.h" +- NULL +-}; +-#else +-extern const char * const jpeg_std_message_table[]; +-#endif +- + /* + * Actual output of an error or trace message. + * Applications may override this method to send JPEG messages somewhere +@@ -409,24 +395,14 @@ reset_error_mgr (j_common_ptr cinfo) + GLOBAL(struct jpeg_error_mgr *) + my_jpeg_std_error (struct jpeg_error_mgr * err) + { ++ err = jpeg_std_error(err); + ++ /* override these functions */ + err->error_exit = my_error_exit; + err->emit_message = emit_message; + err->output_message = output_message; + err->format_message = format_message; + err->reset_error_mgr = reset_error_mgr; + +- err->trace_level = 0; /* default = no tracing */ +- err->num_warnings = 0; /* no warnings emitted yet */ +- err->msg_code = 0; /* may be useful as a flag for "no error" */ +- +- /* Initialize message table pointers */ +- err->jpeg_message_table = jpeg_std_message_table; +- err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1; +- +- err->addon_message_table = nullptr; +- err->first_addon_message = 0; /* for safety */ +- err->last_addon_message = 0; +- + return err; + } + +From 7789a8574b454ebd874522a70930ae4b40726da4 Mon Sep 17 00:00:00 2001 +From: Richard E Barber +Date: Sun, 19 May 2024 16:39:28 -0700 +Subject: [PATCH 2/2] removes redundant jpeg error message + +Co-authored-by: Lawrence37 <45837045+Lawrence37@users.noreply.github.com> +--- + rtengine/jdatasrc.cc | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/rtengine/jdatasrc.cc b/rtengine/jdatasrc.cc +index a0d12657f2..96b6f83b66 100644 +--- a/rtengine/jdatasrc.cc ++++ b/rtengine/jdatasrc.cc +@@ -399,10 +399,6 @@ my_jpeg_std_error (struct jpeg_error_mgr * err) + + /* override these functions */ + err->error_exit = my_error_exit; +- err->emit_message = emit_message; +- err->output_message = output_message; +- err->format_message = format_message; +- err->reset_error_mgr = reset_error_mgr; + + return err; + } diff --git a/graphics/rawtherapee/rawtherapee.SlackBuild b/graphics/rawtherapee/rawtherapee.SlackBuild index 80364a7a67..e236ecd421 100644 --- a/graphics/rawtherapee/rawtherapee.SlackBuild +++ b/graphics/rawtherapee/rawtherapee.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rawtherapee -VERSION=${VERSION:-5.8} +VERSION=${VERSION:-5.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -79,6 +76,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# apply upstream patch - thanks to kgha on LQ! +patch -p1 < $CWD/jpeg_turbo_3.0.3.patch + mkdir -p build cd build cmake \ diff --git a/graphics/rawtherapee/rawtherapee.info b/graphics/rawtherapee/rawtherapee.info index 2fb06432a8..c9a3e039ae 100644 --- a/graphics/rawtherapee/rawtherapee.info +++ b/graphics/rawtherapee/rawtherapee.info @@ -1,8 +1,8 @@ PRGNAM="rawtherapee" -VERSION="5.8" +VERSION="5.10" HOMEPAGE="http://rawtherapee.com/" -DOWNLOAD="http://rawtherapee.com/shared/source/rawtherapee-5.8.tar.xz" -MD5SUM="7c4b2d8246664d84d5061e4c7271d3af" +DOWNLOAD="http://rawtherapee.com/shared/source/rawtherapee-5.10.tar.xz" +MD5SUM="7391fe9c75d1c54ffcd79325c1b59852" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libiptcdata" diff --git a/graphics/screengrab/screengrab.SlackBuild b/graphics/screengrab/screengrab.SlackBuild index d2ae794912..53220ad99d 100644 --- a/graphics/screengrab/screengrab.SlackBuild +++ b/graphics/screengrab/screengrab.SlackBuild @@ -83,6 +83,7 @@ cd build cmake \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/graphics/ufraw/patches/ufraw-0.22-exiv2-0.28.patch b/graphics/ufraw/patches/ufraw-0.22-exiv2-0.28.patch new file mode 100644 index 0000000000..bca74102d8 --- /dev/null +++ b/graphics/ufraw/patches/ufraw-0.22-exiv2-0.28.patch @@ -0,0 +1,69 @@ +--- A/ufraw_exiv2.cc 2024-01-15 12:04:55.379303793 +0100 ++++ B/ufraw_exiv2.cc 2024-01-15 12:08:36.773032241 +0100 +@@ -50,7 +50,7 @@ + uf->inputExifBuf = NULL; + uf->inputExifBufLen = 0; + +- Exiv2::Image::AutoPtr image; ++ Exiv2::Image::UniquePtr image; + if (uf->unzippedBuf != NULL) { + image = Exiv2::ImageFactory::open( + (const Exiv2::byte*)uf->unzippedBuf, uf->unzippedBufLen); +@@ -66,11 +66,7 @@ + if (exifData.empty()) { + std::string error(uf->filename); + error += ": No Exif data found in the file"; +-#if EXIV2_TEST_VERSION(0,27,0) +- throw Exiv2::Error(Exiv2::kerErrorMessage, error); +-#else +- throw Exiv2::Error(1, error); +-#endif ++ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, error); + } + + /* List of tag names taken from exiv2's printSummary() in actions.cpp */ +@@ -135,7 +131,7 @@ + ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return UFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str()); +@@ -156,7 +152,7 @@ + if ((pos = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) + != exifData.end()) { + ufraw_message(UFRAW_SET_LOG, "Resetting %s from '%d' to '1'\n", +- pos->key().c_str(), pos->value().toLong()); ++ pos->key().c_str(), pos->value().toInt64()); + pos->setValue("1"); /* 1 = Normal orientation */ + } + } +@@ -327,7 +323,7 @@ + ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return UFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str()); +@@ -347,7 +343,7 @@ + + char *filename = + uf_win32_locale_filename_from_utf8(uf->conf->outputFilename); +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename); + uf_win32_locale_filename_free(filename); + assert(image.get() != 0); + +@@ -367,7 +363,7 @@ + ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return UFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str()); diff --git a/graphics/ufraw/ufraw.SlackBuild b/graphics/ufraw/ufraw.SlackBuild index 309bc13ad4..0817845e97 100644 --- a/graphics/ufraw/ufraw.SlackBuild +++ b/graphics/ufraw/ufraw.SlackBuild @@ -87,6 +87,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + autoreconf -fi CFLAGS="$SLKCFLAGS" \ diff --git a/graphics/vimiv-qt/build-with-pyproject-toml.patch b/graphics/vimiv-qt/build-with-pyproject-toml.patch new file mode 100644 index 0000000000..e56f28dee2 --- /dev/null +++ b/graphics/vimiv-qt/build-with-pyproject-toml.patch @@ -0,0 +1,12 @@ +--- a/misc/Makefile ++++ b/misc/Makefile +@@ -29,7 +29,8 @@ + @printf "make clean: Remove build directories.\n" + + install: +- python3 setup.py install --root=$(DESTDIR)/ --prefix=$(PREFIX) --record=install_log.txt ++ python3 -m build --no-isolation ++ python3 -m installer -d $(DESTDIR) dist/*.whl + install -Dm644 misc/vimiv.desktop $(APPDIR)/vimiv.desktop + install -Dm644 misc/org.karlch.vimiv.qt.metainfo.xml $(METAINFODIR)/org.karlch.vimiv.qt.metainfo.xml + install -Dm644 LICENSE $(LICENSEDIR)/vimiv/LICENSE diff --git a/graphics/vimiv-qt/vimiv-qt.SlackBuild b/graphics/vimiv-qt/vimiv-qt.SlackBuild index d090781937..83a2819a78 100644 --- a/graphics/vimiv-qt/vimiv-qt.SlackBuild +++ b/graphics/vimiv-qt/vimiv-qt.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for vimiv-qt -# Copyright 2022-2024 Isaac Yu +# Copyright 2022-2025 Isaac Yu # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vimiv-qt VERSION=${VERSION:-0.9.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -47,20 +47,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG @@ -82,6 +68,9 @@ sed -i "s/\$(DATADIR)\\/man/\$(DESTDIR)\\/\$(PREFIX)\\/man/g" misc/Makefile # Do not install license files to /usr/share/licenses sed -i "/LICENSEDIR/d" misc/Makefile +# Fix build error (use pyproject.toml instead of setup.py) +patch -p1 < $CWD/build-with-pyproject-toml.patch + make -f misc/Makefile DESTDIR=$PKG install find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/graphics/zbar/configure.ac.patch b/graphics/zbar/configure.ac.patch new file mode 100644 index 0000000000..6cb7036a0b --- /dev/null +++ b/graphics/zbar/configure.ac.patch @@ -0,0 +1,14 @@ +diff -Naur zbar-0.23.93.orig/configure.ac zbar-0.23.93/configure.ac +--- zbar-0.23.93.orig/configure.ac 2024-01-09 10:13:01.000000000 +0100 ++++ zbar-0.23.93/configure.ac 2024-11-24 11:37:03.410992000 +0100 +@@ -675,8 +675,8 @@ + AS_IF([test "x$with_qt6" = "xno"], + PKG_CHECK_MODULES([QT], + [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0], +- [MOC=`pkg-config Qt5 --variable=moc` +- QT_VERSION=`$PKG_CONFIG Qt5 --modversion` ++ [AC_CHECK_PROGS([MOC], [moc-qt5 moc]) ++ QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`; + qt_pkgconfig_file="zbar-qt5.pc" + ], + [with_qt="no"])) diff --git a/graphics/zbar/zbar.SlackBuild b/graphics/zbar/zbar.SlackBuild index ee8c4e64df..b2fc50a76c 100644 --- a/graphics/zbar/zbar.SlackBuild +++ b/graphics/zbar/zbar.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=zbar -VERSION=${VERSION:-0.23.90} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.23.93} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -84,6 +84,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/configure.ac.patch + autoreconf -fi CFLAGS="$SLKCFLAGS" \ diff --git a/graphics/zbar/zbar.info b/graphics/zbar/zbar.info index 32d50969f4..abda9ae4d6 100644 --- a/graphics/zbar/zbar.info +++ b/graphics/zbar/zbar.info @@ -1,8 +1,8 @@ PRGNAM="zbar" -VERSION="0.23.90" +VERSION="0.23.93" HOMEPAGE="https://sourceforge.net/projects/zbar/" -DOWNLOAD="https://github.com/mchehab/zbar/archive/0.23.90/zbar-0.23.90.tar.gz" -MD5SUM="cb1667e20c1d7acf1b9911414adaeb84" +DOWNLOAD="https://github.com/mchehab/zbar/archive/0.23.93/zbar-0.23.93.tar.gz" +MD5SUM="3f69d17f6495de023b59b3539ce5e605" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/haskell/ghc/ghc.SlackBuild b/haskell/ghc/ghc.SlackBuild index 964b6770c2..f8adcc6c2c 100644 --- a/haskell/ghc/ghc.SlackBuild +++ b/haskell/ghc/ghc.SlackBuild @@ -125,6 +125,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/patches/hp2ps-C-gnu17.patch +patch -p1 < $CWD/patches/sphinx-4-configuration.patch +patch -p1 < $CWD/patches/sphinx-6.patch + +echo "BUILD_SPHINX_PDF := NO" >> mk/build.mk + GHC=$BOOTSTRAPGHC \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/haskell/ghc/patches/hp2ps-C-gnu17.patch b/haskell/ghc/patches/hp2ps-C-gnu17.patch new file mode 100644 index 0000000000..6af1e9fe33 --- /dev/null +++ b/haskell/ghc/patches/hp2ps-C-gnu17.patch @@ -0,0 +1,37 @@ +From 65fa9969280fac5d2c08219a7178e7a0c0da2a17 Mon Sep 17 00:00:00 2001 +From: Jens Petersen +Date: Tue, 28 Jan 2025 09:32:55 +0000 +Subject: [PATCH] hp2ps Utilities.c: include stdlib.h instead of extern malloc + and realloc + +--- + utils/hp2ps/Utilities.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/utils/hp2ps/Utilities.c b/utils/hp2ps/Utilities.c +index f79ddd827154..fc0fdd1e30a5 100644 +--- a/utils/hp2ps/Utilities.c ++++ b/utils/hp2ps/Utilities.c +@@ -1,10 +1,9 @@ + #include "Main.h" + #include ++#include + #include + #include "Error.h" + +-extern void* malloc(); +- + char* + Basename(char *name) + { +@@ -89,7 +88,6 @@ void * + xrealloc(void *p, size_t n) + { + void *r; +- extern void *realloc(); + + r = realloc(p, n); + if (!r) { +-- +GitLab + diff --git a/haskell/ghc/patches/sphinx-4-configuration.patch b/haskell/ghc/patches/sphinx-4-configuration.patch new file mode 100644 index 0000000000..884a0bb39a --- /dev/null +++ b/haskell/ghc/patches/sphinx-4-configuration.patch @@ -0,0 +1,11 @@ +--- ghc-8.10.4/docs/users_guide/conf.py.orig 2021-06-21 13:46:34.196383559 +0200 ++++ ghc-8.10.4/docs/users_guide/conf.py 2021-06-21 13:46:54.839349941 +0200 +@@ -100,7 +100,7 @@ + latex_elements = { + 'inputenc': '', + 'utf8extra': '', +- 'preamble': ''' ++ 'preamble': r''' + \usepackage{fontspec} + \usepackage{makeidx} + \setsansfont{DejaVu Sans} diff --git a/haskell/ghc/patches/sphinx-6.patch b/haskell/ghc/patches/sphinx-6.patch new file mode 100644 index 0000000000..2a2c37adb6 --- /dev/null +++ b/haskell/ghc/patches/sphinx-6.patch @@ -0,0 +1,12 @@ +diff -Naur ghc-8.10.4.orig/docs/users_guide/ghc_config.py.in ghc-8.10.4/docs/users_guide/ghc_config.py.in +--- ghc-8.10.4.orig/docs/users_guide/ghc_config.py.in 2020-12-02 15:16:57.000000000 +0100 ++++ ghc-8.10.4/docs/users_guide/ghc_config.py.in 2025-06-17 22:42:02.429581000 +0200 +@@ -1,6 +1,6 @@ + extlinks = { +- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#'), +- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#'), ++ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '%s'), ++ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '%s'), + } + + libs_base_uri = '../libraries' diff --git a/libraries/2geom/2geom.SlackBuild b/libraries/2geom/2geom.SlackBuild index 7a63cb3ffc..a1e97b6783 100644 --- a/libraries/2geom/2geom.SlackBuild +++ b/libraries/2geom/2geom.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=2geom -VERSION=${VERSION:-1.3} +VERSION=${VERSION:-1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/2geom/2geom.info b/libraries/2geom/2geom.info index ccfe48d462..e2862b4a13 100644 --- a/libraries/2geom/2geom.info +++ b/libraries/2geom/2geom.info @@ -1,8 +1,8 @@ PRGNAM="2geom" -VERSION="1.3" +VERSION="1.4" HOMEPAGE="https://gitlab.com/inkscape/lib2geom/" -DOWNLOAD="https://gitlab.com/inkscape/lib2geom/-/archive/1.3/lib2geom-1.3.tar.gz" -MD5SUM="4240576fcb2802bd9bc6cd5f15b007c7" +DOWNLOAD="https://gitlab.com/inkscape/lib2geom/-/archive/1.4/lib2geom-1.4.tar.gz" +MD5SUM="61d192d537248f12910cf39fe9f60072" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtest double-conversion" diff --git a/libraries/Botan/Botan.SlackBuild b/libraries/Botan/Botan.SlackBuild index d6db49b980..cdead6663e 100644 --- a/libraries/Botan/Botan.SlackBuild +++ b/libraries/Botan/Botan.SlackBuild @@ -31,8 +31,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Botan -VERSION=${VERSION:-2.19.5} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.9.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,9 +82,6 @@ find -L . \ -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + -# https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/botan/files/botan-2.19.5-boost-1.87.patch -patch -p1 < $CWD/botan-2.19.5-boost-1.87.patch - TPMFLAG="" if [ "${TPM:-NO}" = 'YES' ]; then TPMFLAG="--with-tpm" diff --git a/libraries/Botan/Botan.info b/libraries/Botan/Botan.info index ebcd998f09..a9292b0656 100644 --- a/libraries/Botan/Botan.info +++ b/libraries/Botan/Botan.info @@ -1,8 +1,8 @@ PRGNAM="Botan" -VERSION="2.19.5" +VERSION="3.9.0" HOMEPAGE="https://botan.randombit.net/" -DOWNLOAD="https://botan.randombit.net/releases/Botan-2.19.5.tar.xz" -MD5SUM="224a54502cda683766ec05716c4702e0" +DOWNLOAD="https://botan.randombit.net/releases/Botan-3.9.0.tar.xz" +MD5SUM="aa156fc96877565b755f804fc57e8475" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/Botan/botan-2.19.5-boost-1.87.patch b/libraries/Botan/botan-2.19.5-boost-1.87.patch deleted file mode 100644 index a52fbaea13..0000000000 --- a/libraries/Botan/botan-2.19.5-boost-1.87.patch +++ /dev/null @@ -1,361 +0,0 @@ -https://bugs.gentoo.org/946389 -https://github.com/randombit/botan/commit/37fec38ff97604f964122cd2d33f5d503f319b10 - -From 37fec38ff97604f964122cd2d33f5d503f319b10 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ren=C3=A9=20Meusel?= -Date: Thu, 19 Dec 2024 10:28:40 +0100 -Subject: [PATCH] Backport: Remove usage of deprecated asio API - -These were all finally dropped with boost 1.87, so this fixes -build with boost 1.87. - -Co-Authored-By: Jack Lloyd -Co-Authored-By: q66 ---- - src/cli/tls_http_server.cpp | 16 +++++----- - src/cli/tls_proxy.cpp | 46 ++++++++++++++++------------- - src/lib/utils/socket/socket.cpp | 18 +++++------ - src/lib/utils/socket/socket_udp.cpp | 18 +++++------ - 4 files changed, 50 insertions(+), 48 deletions(-) - -diff --git a/src/cli/tls_http_server.cpp b/src/cli/tls_http_server.cpp -index fc0b5bbb77e..67ab126b145 100644 ---- a/src/cli/tls_http_server.cpp -+++ b/src/cli/tls_http_server.cpp -@@ -176,7 +176,7 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this pointer; - - static pointer create( -- boost::asio::io_service& io, -+ boost::asio::io_context& io, - Botan::TLS::Session_Manager& session_manager, - Botan::Credentials_Manager& credentials, - Botan::TLS::Policy& policy) -@@ -201,7 +201,7 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this pointer; - - static pointer create( -- boost::asio::io_service& io, -+ boost::asio::io_context& io, - Botan::TLS::Session_Manager& session_manager, - Botan::Credentials_Manager& credentials, - Botan::TLS::Policy& policy, -- tcp::resolver::iterator endpoints) -+ tcp::resolver::results_type endpoints) - { - return pointer( - new tls_proxy_session( -@@ -141,11 +141,11 @@ class tls_proxy_session final : public std::enable_shared_from_this session_mgr; - -diff --git a/src/lib/utils/socket/socket.cpp b/src/lib/utils/socket/socket.cpp -index bc632259a64..0ce4e85830f 100644 ---- a/src/lib/utils/socket/socket.cpp -+++ b/src/lib/utils/socket/socket.cpp -@@ -48,19 +48,17 @@ class Asio_Socket final : public OS::Socket - std::chrono::milliseconds timeout) : - m_timeout(timeout), m_timer(m_io), m_tcp(m_io) - { -- m_timer.expires_from_now(m_timeout); -+ m_timer.expires_after(m_timeout); - check_timeout(); - - boost::asio::ip::tcp::resolver resolver(m_io); -- boost::asio::ip::tcp::resolver::query query(hostname, service); -- boost::asio::ip::tcp::resolver::iterator dns_iter = resolver.resolve(query); -+ boost::asio::ip::tcp::resolver::results_type endpoints = resolver.resolve(hostname, service); - - boost::system::error_code ec = boost::asio::error::would_block; - - auto connect_cb = [&ec](const boost::system::error_code& e, -- boost::asio::ip::tcp::resolver::iterator) { ec = e; }; -- -- boost::asio::async_connect(m_tcp, dns_iter, connect_cb); -+ const boost::asio::ip::tcp::resolver::results_type::iterator&) { ec = e; }; -+ boost::asio::async_connect(m_tcp, endpoints.begin(), endpoints.end(), connect_cb); - - while(ec == boost::asio::error::would_block) - { -@@ -75,7 +73,7 @@ class Asio_Socket final : public OS::Socket - - void write(const uint8_t buf[], size_t len) override - { -- m_timer.expires_from_now(m_timeout); -+ m_timer.expires_after(m_timeout); - - boost::system::error_code ec = boost::asio::error::would_block; - -@@ -92,7 +90,7 @@ class Asio_Socket final : public OS::Socket - - size_t read(uint8_t buf[], size_t len) override - { -- m_timer.expires_from_now(m_timeout); -+ m_timer.expires_after(m_timeout); - - boost::system::error_code ec = boost::asio::error::would_block; - size_t got = 0; -@@ -115,7 +113,7 @@ class Asio_Socket final : public OS::Socket - private: - void check_timeout() - { -- if(m_tcp.is_open() && m_timer.expires_at() < std::chrono::system_clock::now()) -+ if(m_tcp.is_open() && m_timer.expiry() < std::chrono::system_clock::now()) - { - boost::system::error_code err; - m_tcp.close(err); -@@ -125,7 +123,7 @@ class Asio_Socket final : public OS::Socket - } - - const std::chrono::milliseconds m_timeout; -- boost::asio::io_service m_io; -+ boost::asio::io_context m_io; - boost::asio::system_timer m_timer; - boost::asio::ip::tcp::socket m_tcp; - }; -diff --git a/src/lib/utils/socket/socket_udp.cpp b/src/lib/utils/socket/socket_udp.cpp -index fbbdd9abbcc..82a25b49cda 100644 ---- a/src/lib/utils/socket/socket_udp.cpp -+++ b/src/lib/utils/socket/socket_udp.cpp -@@ -48,19 +48,17 @@ class Asio_SocketUDP final : public OS::SocketUDP - std::chrono::microseconds timeout) : - m_timeout(timeout), m_timer(m_io), m_udp(m_io) - { -- m_timer.expires_from_now(m_timeout); -+ m_timer.expires_after(m_timeout); - check_timeout(); - - boost::asio::ip::udp::resolver resolver(m_io); -- boost::asio::ip::udp::resolver::query query(hostname, service); -- boost::asio::ip::udp::resolver::iterator dns_iter = resolver.resolve(query); -+ boost::asio::ip::udp::resolver::results_type endpoints = resolver.resolve(hostname, service); - - boost::system::error_code ec = boost::asio::error::would_block; - - auto connect_cb = [&ec](const boost::system::error_code& e, -- boost::asio::ip::udp::resolver::iterator) { ec = e; }; -- -- boost::asio::async_connect(m_udp, dns_iter, connect_cb); -+ const boost::asio::ip::udp::resolver::results_type::iterator&) { ec = e; }; -+ boost::asio::async_connect(m_udp, endpoints.begin(), endpoints.end(), connect_cb); - - while(ec == boost::asio::error::would_block) - { -@@ -75,7 +73,7 @@ class Asio_SocketUDP final : public OS::SocketUDP - - void write(const uint8_t buf[], size_t len) override - { -- m_timer.expires_from_now(m_timeout); -+ m_timer.expires_after(m_timeout); - - boost::system::error_code ec = boost::asio::error::would_block; - -@@ -95,7 +93,7 @@ class Asio_SocketUDP final : public OS::SocketUDP - - size_t read(uint8_t buf[], size_t len) override - { -- m_timer.expires_from_now(m_timeout); -+ m_timer.expires_after(m_timeout); - - boost::system::error_code ec = boost::asio::error::would_block; - size_t got = 0; -@@ -121,7 +119,7 @@ class Asio_SocketUDP final : public OS::SocketUDP - private: - void check_timeout() - { -- if(m_udp.is_open() && m_timer.expires_at() < std::chrono::system_clock::now()) -+ if(m_udp.is_open() && m_timer.expiry() < std::chrono::system_clock::now()) - { - boost::system::error_code err; - m_udp.close(err); -@@ -131,7 +129,7 @@ class Asio_SocketUDP final : public OS::SocketUDP - } - - const std::chrono::microseconds m_timeout; -- boost::asio::io_service m_io; -+ boost::asio::io_context m_io; - boost::asio::system_timer m_timer; - boost::asio::ip::udp::socket m_udp; - }; - diff --git a/libraries/CEGUI/CEGUI.SlackBuild b/libraries/CEGUI/CEGUI.SlackBuild deleted file mode 100644 index a5f65c8feb..0000000000 --- a/libraries/CEGUI/CEGUI.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash - -# Slackware build script for CEGUI -# Written by Phil Warner -# Modified by Robby Workman -# Modified by Dave Woodfall - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=CEGUI -SRCNAM=cegui -VERSION=${VERSION:-0.8.7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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.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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -sed -i '1iadd_definitions(-std=c++11)' \ - cegui/src/RendererModules/OpenGL/CMakeLists.txt \ - cegui/src/RendererModules/Ogre/CMakeLists.txt \ - application_templates/CMakeLists.txt \ - samples_framework/CMakeLists.txt - -mkdir build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCEGUI_BUILD_PYTHON_MODULES=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DMAN_INSTALL_DIR=/usr/man \ - -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF \ - -DCEGUI_BUILD_LUA_MODULE=OFF \ - -DCEGUI_BUILD_LUA_GENERATOR=OFF \ - -DCEGUI_BUILD_LUA_GENERATOR=OFF \ - -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \ - -DCEGUI_BUILD_RENDERER_OGRE=OFF \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc *.txt $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/CEGUI/CEGUI.info b/libraries/CEGUI/CEGUI.info deleted file mode 100644 index 1e684af0c2..0000000000 --- a/libraries/CEGUI/CEGUI.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="CEGUI" -VERSION="0.8.7" -HOMEPAGE="http://cegui.org.uk/wiki/Main_Page" -DOWNLOAD="http://downloads.sf.net/crayzedsgui/cegui-0.8.7.tar.bz2" -MD5SUM="cebcc95e205b9ad353db0d65b9b2d505" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Phillip Warner" -EMAIL="pc_warner@yahoo.com" diff --git a/libraries/CEGUI/README b/libraries/CEGUI/README deleted file mode 100644 index 3e6e992552..0000000000 --- a/libraries/CEGUI/README +++ /dev/null @@ -1,20 +0,0 @@ -CEGUI - windowing and widget library - -Crazy Eddie's GUI System is a free library providing windowing -and widgets for graphics APIs / engines where such functionality -is not natively available or is severely lacking. The library is -object oriented, written in C++, and targeted at game developers -who should be spending their time creating great games, not -building GUI sub-systems! - -The configure script for CEGUI will detect whether or not you have -an optional dependency installed and will enable/disable the option -accordingly. However, you may want to specify this yourself. In -particular, pay attention to the image codecs because you might want -to disable the others to ensure that the one you want to use is the -default codec. - -Optional dependencies include glfw3, xerces-c, FreeImage, and DevIL. -There are perhaps others - see the CMakeLists.txt file. - -The ogre renderer is disabled, as it won't build. diff --git a/libraries/CEGUI/slack-desc b/libraries/CEGUI/slack-desc deleted file mode 100644 index 0bd1acd311..0000000000 --- a/libraries/CEGUI/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -CEGUI: CEGUI (windowing and widget library) -CEGUI: -CEGUI: Crazy Eddie's GUI System is a free library providing windowing and -CEGUI: widgets for graphics APIs / engines where such functionality is not -CEGUI: natively available, or severely lacking. The library is object -CEGUI: orientated, written in C++, and targeted at games developers who -CEGUI: should be spending their time creating great games, not building GUI -CEGUI: sub-systems! -CEGUI: -CEGUI: http://www.cegui.org.uk/wiki/index.php/Main_Page -CEGUI: diff --git a/libraries/MyGUI/MyGUI.SlackBuild b/libraries/MyGUI/MyGUI.SlackBuild index 6737d63981..0880d83993 100644 --- a/libraries/MyGUI/MyGUI.SlackBuild +++ b/libraries/MyGUI/MyGUI.SlackBuild @@ -84,27 +84,36 @@ find -L . \ sed -i '71 i set(MYGUI_GCC_VISIBILITY_FLAGS "")' CMakeLists.txt sed -i 's/\${OIS_LIBRARIES}/${OIS_LIBRARIES} boost_system/g' Common/CMakeLists.txt +sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./MyGUIEngine/include/MyGUI_Types.h + +patch -p1 < $CWD/cmake4.patch mkdir -p build cd build cmake \ + -Bbuild \ + -GNinja \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMYGUI_INSTALL_TOOLS=TRUE \ - -DMYGUI_INSTALL_DOCS=FALSE \ + -DMYGUI_INSTALL_DOCS=TRUE \ -DMYGUI_INSTALL_SAMPLES=FALSE \ -DMYGUI_INSTALL_MEDIA=TRUE \ - -DMYGUI_STATIC=FALSE \ + -DBUILD_SHARED_LIBS=TRUE \ -DMYGUI_USE_FREETYPE=TRUE \ -DMYGUI_BUILD_PLUGINS=TRUE \ -DMYGUI_BUILD_TOOLS=TRUE \ + -DMYGUI_BUILD_DEMOS=TRUE \ + -DMYGUI_RENDERSYSTEM=7 \ -DMYGUI_BUILD_WRAPPER=FALSE \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ .. - make - make install DESTDIR=$PKG + "${NINJA:=ninja}" -C build + $NINJA -C build api-docs + DESTDIR="$PKG" $NINJA -C build install cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/libraries/MyGUI/cmake4.patch b/libraries/MyGUI/cmake4.patch new file mode 100644 index 0000000000..1241f94e25 --- /dev/null +++ b/libraries/MyGUI/cmake4.patch @@ -0,0 +1,12 @@ +diff -Naur mygui-MyGUI3.4.1.orig/CMakeLists.txt mygui-MyGUI3.4.1/CMakeLists.txt +--- mygui-MyGUI3.4.1.orig/CMakeLists.txt 2021-03-01 00:41:43.000000000 +0100 ++++ mygui-MyGUI3.4.1/CMakeLists.txt 2025-07-14 09:20:55.636062000 +0200 +@@ -8,7 +8,7 @@ + cmake_minimum_required(VERSION 2.8.12) + cmake_policy(SET CMP0003 NEW) + cmake_policy(SET CMP0011 NEW) +-cmake_policy(SET CMP0048 OLD) ++cmake_policy(SET CMP0048 NEW) + + # for link time optimization, remove if cmake version is >= 3.9 + if(POLICY CMP0069) # LTO diff --git a/libraries/ORBit2/ORBit2.SlackBuild b/libraries/ORBit2/ORBit2.SlackBuild index 6aac3d721e..d47be71520 100644 --- a/libraries/ORBit2/ORBit2.SlackBuild +++ b/libraries/ORBit2/ORBit2.SlackBuild @@ -79,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/ORBit2/patches/ORBit2-configure-c99.patch b/libraries/ORBit2/patches/ORBit2-configure-c99.patch new file mode 100644 index 0000000000..8e267b5658 --- /dev/null +++ b/libraries/ORBit2/patches/ORBit2-configure-c99.patch @@ -0,0 +1,147 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 3b67d9b5cae2d766..408b9845f8f1f328 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -23,7 +23,7 @@ AC_DEFUN([AC_CHECK_ALIGNOF], + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; $1 s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +diff --git a/configure b/configure +index 1fed47a1d26c3f36..63c32a20c6574672 100755 +--- a/configure ++++ b/configure +@@ -12346,7 +12346,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include +- main () ++ int main (void) + { + return 0; + } +@@ -12387,7 +12387,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_octet s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12434,7 +12434,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_boolean s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12481,7 +12481,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_char s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12528,7 +12528,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_wchar s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12575,7 +12575,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_short s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12622,7 +12622,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_long s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12669,7 +12669,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_long_long s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12716,7 +12716,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_float s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12763,7 +12763,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_double s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12810,7 +12810,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_long_double s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12857,7 +12857,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_struct s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12904,7 +12904,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_pointer s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +diff --git a/configure.in b/configure.in +index 04d4b2a397d53196..4a25f4e6ec84bdac 100644 +--- a/configure.in ++++ b/configure.in +@@ -220,7 +220,7 @@ dnl + dofus_save_libs="$LIBS" + LIBS="$ORBIT_LIBS $LIBS" + AC_TRY_RUN([ #include +- main () ++ int main (void) + { + return 0; + } ],, diff --git a/libraries/ORBit2/patches/pointer-type.patch b/libraries/ORBit2/patches/pointer-type.patch new file mode 100644 index 0000000000..f1e95644e4 --- /dev/null +++ b/libraries/ORBit2/patches/pointer-type.patch @@ -0,0 +1,11 @@ +--- ./src/orb/GIOP/giop-recv-buffer.c~ 2010-02-09 06:05:35.000000000 -0600 ++++ ./src/orb/GIOP/giop-recv-buffer.c 2024-01-30 09:31:58.383855651 -0600 +@@ -559,7 +559,7 @@ + ent->src_thread = giop_thread_self (); + ent->async_cb = NULL; + +- ent->cnx = giop_connection_ref (cnx); ++ ent->cnx = (GIOPConnection *)giop_connection_ref (cnx); + ent->msg_type = msg_type; + ent->request_id = request_id; + ent->buffer = NULL; diff --git a/libraries/OpenBLAS/OpenBLAS.SlackBuild b/libraries/OpenBLAS/OpenBLAS.SlackBuild deleted file mode 100644 index 6ca93b9f6c..0000000000 --- a/libraries/OpenBLAS/OpenBLAS.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash -# -# Slackware build script for OpenBLAS -# Written by Mário Antunes (mariolpantunes@gmail.com) - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM="OpenBLAS" -VERSION=${VERSION:-0.3.23} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -PREFIX=${PREFIX:-/usr} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi -EXTRAPARMS="" -TARGET=${TARGET:-"GENERIC"} -if [ "x$( uname -p|grep QEMU|wc -l )" = "x1" ]; then - #we are running in a vm with a QEMU cpu. OpenBLAS does not like this - EXTRAPARMS="DYNAMIC_ARCH=1" - if [ "x$TARGET" = "x" ]; then - echo "the cpu is not recognised by OpenBLAS. specify a target cpu" - echo "using variable TARGET=targetname" - echo "look at TargetList.txt in the source for valid TARGET types." - exit 2 - else - EXTRAPARMS=$EXTRAPARMS" TARGET="$TARGET - fi -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -make $EXTRAPARMS \ - DYNAMIC_ARCH=1 \ - TARGET=$TARGET \ - NO_STATIC=1 \ - NO_AFFINITY=1 \ - BUILD_RELAPACK=1 \ - DESTDIR=$PKG \ - PREFIX=$PREFIX \ - OPENBLAS_LIBRARY_DIR=$PREFIX/lib$LIBDIRSUFFIX -make \ - $EXTRAPARMS \ - DYNAMIC_ARCH=1 \ - TARGET=$TARGET \ - NO_STATIC=1 \ - NO_AFFINITY=1 \ - BUILD_RELAPACK=1 \ - DESTDIR=$PKG \ - PREFIX=$PREFIX \ - OPENBLAS_LIBRARY_DIR=$PREFIX/lib$LIBDIRSUFFIX \ - 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 - -rmdir $PKG$PREFIX/bin - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - BACKERS.md CONTRIBUTORS.md Changelog.txt LICENSE README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/OpenBLAS/OpenBLAS.info b/libraries/OpenBLAS/OpenBLAS.info deleted file mode 100644 index c7cf7cc523..0000000000 --- a/libraries/OpenBLAS/OpenBLAS.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="OpenBLAS" -VERSION="0.3.23" -HOMEPAGE="http://www.openblas.net/" -DOWNLOAD="https://github.com/xianyi/OpenBLAS/releases/download/v0.3.23/OpenBLAS-0.3.23.tar.gz" -MD5SUM="115634b39007de71eb7e75cf7591dfb2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Mario Antunes" -EMAIL="mariolpantunes@gmail.com" diff --git a/libraries/OpenBLAS/README b/libraries/OpenBLAS/README deleted file mode 100644 index 8ba19cecfa..0000000000 --- a/libraries/OpenBLAS/README +++ /dev/null @@ -1,10 +0,0 @@ -OpenBLAS is an optimized BLAS library - -Added symbolic link to install a generic blas library that can be used -by Octave and R. - -OpenBLAS has cpu specific targetted assembly code for speed -optimisation. In most cases, the installation will detect the -correct CPU architecture If you want to specify the architecture -you can define the EXTRAPARAMS environmental variable with -EXTRAPARAMS="TARGET=ZEN" (for AMD Ryzen CPUs) diff --git a/libraries/OpenBLAS/slack-desc b/libraries/OpenBLAS/slack-desc deleted file mode 100644 index 13d50b00fd..0000000000 --- a/libraries/OpenBLAS/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -OpenBLAS: OpenBLAS (BLAS library) -OpenBLAS: -OpenBLAS: OpenBLAS is an optimized BLAS library based on -OpenBLAS: GotoBLAS2 1.13 BSD version. -OpenBLAS: -OpenBLAS: -OpenBLAS: -OpenBLAS: -OpenBLAS: -OpenBLAS: -OpenBLAS: diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild index 0357d47e42..d80834c964 100644 --- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild +++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild @@ -64,6 +64,9 @@ find -L . \ # whose current versions at SBo cause build failure patch -p0 < $CWD/no-asio-occ.diff +# https://github.com/openscenegraph/OpenSceneGraph/issues/1111 +sed -i '/FFmpeg/d' CMakeLists.txt + mkdir -p build cd build cmake .. \ @@ -73,6 +76,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_POSTFIX=$LIBDIRSUFFIX \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DBUILD_OSG_EXAMPLES=ON \ make diff --git a/libraries/SDL_Pango/SDL_Pango.SlackBuild b/libraries/SDL_Pango/SDL_Pango.SlackBuild index de28ac1e0c..64c1019e61 100644 --- a/libraries/SDL_Pango/SDL_Pango.SlackBuild +++ b/libraries/SDL_Pango/SDL_Pango.SlackBuild @@ -85,7 +85,7 @@ autoreconf -i libtoolize --copy --force automake -a -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/allegro/allegro.SlackBuild b/libraries/allegro/allegro.SlackBuild index c8029496c8..7950a6cfbc 100644 --- a/libraries/allegro/allegro.SlackBuild +++ b/libraries/allegro/allegro.SlackBuild @@ -93,6 +93,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG diff --git a/libraries/allegro4/allegro4.SlackBuild b/libraries/allegro4/allegro4.SlackBuild index d237453a3c..4f05b778ad 100644 --- a/libraries/allegro4/allegro4.SlackBuild +++ b/libraries/allegro4/allegro4.SlackBuild @@ -103,6 +103,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install/strip DESTDIR=$PKG diff --git a/libraries/alure/alure.SlackBuild b/libraries/alure/alure.SlackBuild index 5f4e5f824f..e3823d7ca6 100644 --- a/libraries/alure/alure.SlackBuild +++ b/libraries/alure/alure.SlackBuild @@ -98,6 +98,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DBUILD_STATIC=OFF \ -DCMAKE_BUILD_TYPE=Release .. + find -name build.make | xargs sed -e 's|\;| |g' -i make make install/strip DESTDIR=$PKG cd .. diff --git a/libraries/antlr4/antlr4.SlackBuild b/libraries/antlr4/antlr4.SlackBuild index e65576f684..192a696b8f 100644 --- a/libraries/antlr4/antlr4.SlackBuild +++ b/libraries/antlr4/antlr4.SlackBuild @@ -84,6 +84,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_STATIC_CRT=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/appstream-glib/README b/libraries/appstream-glib/README deleted file mode 100644 index 80dfa9af5e..0000000000 --- a/libraries/appstream-glib/README +++ /dev/null @@ -1 +0,0 @@ -appstream-glib - libary to help reading and writing AppStream metadata. diff --git a/libraries/appstream-glib/appstream-glib.SlackBuild b/libraries/appstream-glib/appstream-glib.SlackBuild deleted file mode 100644 index 18962a929c..0000000000 --- a/libraries/appstream-glib/appstream-glib.SlackBuild +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash - -# Slackware build script for appstream-glib - -# Copyright 2017-2021 Andrew Clemons, Wellington New Zealand -# Copyright 2022,2024 Andrew Clemons, Tokyo Japan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=appstream-glib -VERSION=${VERSION:-0.8.3} -SRCVERSION=$(echo "$PRGNAM" | tr - _)_$(echo "$VERSION" | tr . _) -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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-$SRCVERSION -tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz -cd $PRGNAM-$SRCVERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -meson \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - -Dgtk-doc=true \ - .. - -"${NINJA:=ninja}" -$NINJA -DESTDIR=$PKG $NINJA install -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -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 MAINTAINERS NEWS README.md 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 diff --git a/libraries/appstream-glib/appstream-glib.info b/libraries/appstream-glib/appstream-glib.info deleted file mode 100644 index 9e3aea5f9d..0000000000 --- a/libraries/appstream-glib/appstream-glib.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="appstream-glib" -VERSION="0.8.3" -HOMEPAGE="https://github.com/hughsie/appstream-glib" -DOWNLOAD="https://github.com/hughsie/appstream-glib/archive/appstream_glib_0_8_3/appstream-glib-appstream_glib_0_8_3.tar.gz" -MD5SUM="9818702cda4bda00eeec2db9758e4a20" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gcab" -MAINTAINER="Andrew Clemons" -EMAIL="andrew.clemons@gmail.com" diff --git a/libraries/appstream-glib/slack-desc b/libraries/appstream-glib/slack-desc deleted file mode 100644 index 002f3f3db5..0000000000 --- a/libraries/appstream-glib/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -appstream-glib: appstream-glib (library for reading and writing AppStream metadata) -appstream-glib: -appstream-glib: This library provides GObjects and helper methods to make it -appstream-glib: easy to read and write AppStream metadata. -appstream-glib: -appstream-glib: https://github.com/hughsie/appstream-glib/ -appstream-glib: -appstream-glib: -appstream-glib: -appstream-glib: -appstream-glib: diff --git a/libraries/argtable/argtable.SlackBuild b/libraries/argtable/argtable.SlackBuild index cf4b4924db..fbe46812f2 100644 --- a/libraries/argtable/argtable.SlackBuild +++ b/libraries/argtable/argtable.SlackBuild @@ -93,6 +93,8 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ # man and html pages misuse autoconf macros patch -p1 < $CWD/doc_paths.diff +for i in $CWD/patches/* ; do patch -p1 < $i ; done + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/argtable/patches/argtable-2.13-Fix-implicit-function-declaration.patch b/libraries/argtable/patches/argtable-2.13-Fix-implicit-function-declaration.patch new file mode 100644 index 0000000000..14ade74afa --- /dev/null +++ b/libraries/argtable/patches/argtable-2.13-Fix-implicit-function-declaration.patch @@ -0,0 +1,16 @@ +From febb2928d1e72c7adc914b2ef8e0611e1a5ea3fd Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Thu, 6 Oct 2022 18:10:52 +0100 +Subject: [PATCH] Fix implicit function declaration + +Bug: https://bugs.gentoo.org/871231 +--- a/src/arg_int.c ++++ b/src/arg_int.c +@@ -29,6 +29,7 @@ USA. + /* #endif */ + + #include "argtable2.h" ++#include + #include + + /* local error codes */ diff --git a/libraries/argtable/patches/argtable-2.13-Fix-undeclared-library-function.patch b/libraries/argtable/patches/argtable-2.13-Fix-undeclared-library-function.patch new file mode 100644 index 0000000000..7f42d43727 --- /dev/null +++ b/libraries/argtable/patches/argtable-2.13-Fix-undeclared-library-function.patch @@ -0,0 +1,28 @@ +From 519609d844f1e5bbf37407de8e43fa2d2be03262 Mon Sep 17 00:00:00 2001 +From: Brahmajit Das +Date: Sun, 7 May 2023 00:03:40 +0530 +Subject: [PATCH] Fix undeclared library function strcmp + +Bug: https://bugs.gentoo.org/885609 +--- a/tests/fntests.c ++++ b/tests/fntests.c +@@ -1,5 +1,6 @@ + #include "../src/argtable2.h" + #include ++#include + + /* for memory leak debugging */ + #ifdef DMALLOC +--- a/tests/test_file.c ++++ b/tests/test_file.c +@@ -21,6 +21,7 @@ USA. + + #include "../src/argtable2.h" + #include ++#include + + /* for memory leak debugging */ + #ifdef DMALLOC +-- +2.40.1 + diff --git a/libraries/assimp/assimp.SlackBuild b/libraries/assimp/assimp.SlackBuild index 7186c96a5e..5d48a9c0aa 100644 --- a/libraries/assimp/assimp.SlackBuild +++ b/libraries/assimp/assimp.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=assimp VERSION=${VERSION:-5.0.1} -BUILD=${BUILD:-2} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,6 +76,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 {} \+ +# 20250614 KEC: gcc-15 compatibility. +patch -p0 < $CWD/gcc-15.patch + +# 20250330 KEC: Added POLICY_VERSION_MINIMUM for cmake compatibility. mkdir -p build cd build cmake \ @@ -84,6 +88,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DASSIMP_LIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ -DASSIMP_BUILD_TESTS=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/assimp/gcc-15.patch b/libraries/assimp/gcc-15.patch new file mode 100644 index 0000000000..0fccca29c0 --- /dev/null +++ b/libraries/assimp/gcc-15.patch @@ -0,0 +1,243 @@ +diff -ur code.old/AMF/AMFImporter.hpp code/AMF/AMFImporter.hpp +--- code.old/AMF/AMFImporter.hpp 2025-06-14 16:33:11.800468946 +0900 ++++ code/AMF/AMFImporter.hpp 2025-06-14 16:33:31.484791445 +0900 +@@ -62,6 +62,7 @@ + + // Header files, stdlib. + #include ++#include + + namespace Assimp { + +diff -ur code.old/AMF/AMFImporter_Node.hpp code/AMF/AMFImporter_Node.hpp +--- code.old/AMF/AMFImporter_Node.hpp 2025-06-14 16:33:11.800468946 +0900 ++++ code/AMF/AMFImporter_Node.hpp 2025-06-14 16:33:40.064933012 +0900 +@@ -54,6 +54,7 @@ + #include + #include + #include ++#include + + // Header files, Assimp. + #include "assimp/types.h" +diff -ur code.old/Collada/ColladaHelper.h code/Collada/ColladaHelper.h +--- code.old/Collada/ColladaHelper.h 2025-06-14 16:33:11.803468995 +0900 ++++ code/Collada/ColladaHelper.h 2025-06-14 16:34:51.575133548 +0900 +@@ -51,6 +51,7 @@ + #include + #include + #include ++#include + + struct aiMaterial; + +diff -ur code.old/Common/IFF.h code/Common/IFF.h +--- code.old/Common/IFF.h 2025-06-14 16:33:11.804469012 +0900 ++++ code/Common/IFF.h 2025-06-14 16:34:33.248822639 +0900 +@@ -6,6 +6,7 @@ + #define AI_IFF_H_INCLUDED + + #include ++#include + + namespace Assimp { + namespace IFF { +diff -ur code.old/FBX/FBXDocument.h code/FBX/FBXDocument.h +--- code.old/FBX/FBXDocument.h 2025-06-14 16:33:11.805469028 +0900 ++++ code/FBX/FBXDocument.h 2025-06-14 16:35:01.614304714 +0900 +@@ -51,6 +51,7 @@ + #include + #include "FBXProperties.h" + #include "FBXParser.h" ++#include + + #define _AI_CONCAT(a,b) a ## b + #define AI_CONCAT(a,b) _AI_CONCAT(a,b) +diff -ur code.old/FBX/FBXExportProperty.h code/FBX/FBXExportProperty.h +--- code.old/FBX/FBXExportProperty.h 2025-06-14 16:33:11.805469028 +0900 ++++ code/FBX/FBXExportProperty.h 2025-06-14 16:34:55.867206655 +0900 +@@ -54,6 +54,7 @@ + #include + #include + #include // is_void ++#include + + namespace Assimp { + namespace FBX { +diff -ur code.old/FBX/FBXUtil.h code/FBX/FBXUtil.h +--- code.old/FBX/FBXUtil.h 2025-06-14 16:33:11.806469044 +0900 ++++ code/FBX/FBXUtil.h 2025-06-14 16:35:04.593355617 +0900 +@@ -49,6 +49,7 @@ + #include "FBXCompileConfig.h" + #include "FBXTokenizer.h" + #include ++#include + + namespace Assimp { + namespace FBX { +diff -ur code.old/HMP/HMPFileData.h code/HMP/HMPFileData.h +--- code.old/HMP/HMPFileData.h 2025-06-14 16:33:11.806469044 +0900 ++++ code/HMP/HMPFileData.h 2025-06-14 16:35:49.747132942 +0900 +@@ -48,6 +48,7 @@ + + #include + #include ++#include + + // to make it easier for us, we test the magic word against both "endianesses" + #define AI_HMP_MAGIC_NUMBER_BE_4 AI_MAKE_MAGIC("HMP4") +diff -ur code.old/LWO/LWOLoader.h code/LWO/LWOLoader.h +--- code.old/LWO/LWOLoader.h 2025-06-14 16:33:11.810469109 +0900 ++++ code/LWO/LWOLoader.h 2025-06-14 16:34:48.021073093 +0900 +@@ -52,6 +52,7 @@ + #include + + #include ++#include + + struct aiTexture; + struct aiNode; +diff -ur code.old/MD2/MD2FileData.h code/MD2/MD2FileData.h +--- code.old/MD2/MD2FileData.h 2025-06-14 16:33:11.810469109 +0900 ++++ code/MD2/MD2FileData.h 2025-06-14 16:35:43.018016448 +0900 +@@ -49,6 +49,7 @@ + + #include + #include ++#include + + #include + +diff -ur code.old/MD2/MD2Loader.h code/MD2/MD2Loader.h +--- code.old/MD2/MD2Loader.h 2025-06-14 16:33:11.810469109 +0900 ++++ code/MD2/MD2Loader.h 2025-06-14 16:35:46.490076530 +0900 +@@ -50,6 +50,7 @@ + #include + #include + #include "MD2FileData.h" ++#include + + struct aiNode; + +diff -ur code.old/MDC/MDCFileData.h code/MDC/MDCFileData.h +--- code.old/MDC/MDCFileData.h 2025-06-14 16:33:11.811469126 +0900 ++++ code/MDC/MDCFileData.h 2025-06-14 16:35:53.468197452 +0900 +@@ -57,6 +57,7 @@ + + #include + #include ++#include + + namespace Assimp { + namespace MDC { +diff -ur code.old/MDL/MDLFileData.h code/MDL/MDLFileData.h +--- code.old/MDL/MDLFileData.h 2025-06-14 16:33:11.811469126 +0900 ++++ code/MDL/MDLFileData.h 2025-06-14 16:35:59.158296221 +0900 +@@ -60,6 +60,7 @@ + #include + #include + #include ++#include + + struct aiMaterial; + +diff -ur code.old/MMD/MMDPmdParser.h code/MMD/MMDPmdParser.h +--- code.old/MMD/MMDPmdParser.h 2025-06-14 16:33:11.811469126 +0900 ++++ code/MMD/MMDPmdParser.h 2025-06-14 16:35:08.105415692 +0900 +@@ -47,6 +47,7 @@ + #include + #include + #include "MMDCpp14.h" ++#include + + namespace pmd + { +diff -ur code.old/MMD/MMDPmxParser.h code/MMD/MMDPmxParser.h +--- code.old/MMD/MMDPmxParser.h 2025-06-14 16:33:11.811469126 +0900 ++++ code/MMD/MMDPmxParser.h 2025-06-14 16:35:15.902549307 +0900 +@@ -47,6 +47,7 @@ + #include + #include + #include "MMDCpp14.h" ++#include + + namespace pmx + { +diff -ur code.old/MMD/MMDVmdParser.h code/MMD/MMDVmdParser.h +--- code.old/MMD/MMDVmdParser.h 2025-06-14 16:33:11.811469126 +0900 ++++ code/MMD/MMDVmdParser.h 2025-06-14 16:35:11.989482209 +0900 +@@ -48,6 +48,7 @@ + #include + #include + #include "MMDCpp14.h" ++#include + + namespace vmd + { +diff -ur code.old/NDO/NDOLoader.h code/NDO/NDOLoader.h +--- code.old/NDO/NDOLoader.h 2025-06-14 16:33:11.812469142 +0900 ++++ code/NDO/NDOLoader.h 2025-06-14 16:34:39.594930069 +0900 +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + + struct aiImporterDesc; +diff -ur code.old/Ogre/OgreBinarySerializer.h code/Ogre/OgreBinarySerializer.h +--- code.old/Ogre/OgreBinarySerializer.h 2025-06-14 16:33:11.813469158 +0900 ++++ code/Ogre/OgreBinarySerializer.h 2025-06-14 16:35:56.385248068 +0900 +@@ -47,6 +47,7 @@ + + #include "OgreStructs.h" + #include ++#include + + namespace Assimp + { +diff -ur code.old/X3D/FIReader.hpp code/X3D/FIReader.hpp +--- code.old/X3D/FIReader.hpp 2025-06-14 16:33:11.817469223 +0900 ++++ code/X3D/FIReader.hpp 2025-06-14 16:33:42.289969819 +0900 +@@ -56,7 +56,7 @@ + #include + #include + //#include +-//#include ++#include + #ifdef ASSIMP_USE_HUNTER + # include + #else +diff -ur code.old/glTF/glTFAsset.h code/glTF/glTFAsset.h +--- code.old/glTF/glTFAsset.h 2025-06-14 16:33:11.818469240 +0900 ++++ code/glTF/glTFAsset.h 2025-06-14 16:35:31.092810543 +0900 +@@ -60,6 +60,7 @@ + #include + #include + #include ++#include + + #define RAPIDJSON_HAS_STDSTRING 1 + #include +diff -ur code.old/glTF/glTFCommon.h code/glTF/glTFCommon.h +--- code.old/glTF/glTFCommon.h 2025-06-14 16:33:11.819469256 +0900 ++++ code/glTF/glTFCommon.h 2025-06-14 16:35:34.826874941 +0900 +@@ -51,6 +51,7 @@ + #include + #include + #include ++#include + + #define RAPIDJSON_HAS_STDSTRING 1 + #include +diff -ur code.old/glTF2/glTF2Asset.h code/glTF2/glTF2Asset.h +--- code.old/glTF2/glTF2Asset.h 2025-06-14 16:33:11.819469256 +0900 ++++ code/glTF2/glTF2Asset.h 2025-06-14 16:35:39.648958206 +0900 +@@ -61,6 +61,7 @@ + #include + #include + #include ++#include + + #define RAPIDJSON_HAS_STDSTRING 1 + #include diff --git a/libraries/aubio/README b/libraries/aubio/README index 0bab21e1c8..d1c71a9330 100644 --- a/libraries/aubio/README +++ b/libraries/aubio/README @@ -7,7 +7,7 @@ results too. jack and ffmpeg are optional dependencies. -The python bindings are built if numpy is available and the python3 -ones are built if numpy3 is available: if both versions of python -are present in the system, the aubio and aubiocut python scripts -will use python3. +The python2 bindings are built if python2-numpy is available and +the python3 ones are built if python3-numpy is available: if both +versions of numpy are present in the system, the aubio and aubiocut +python scripts will use python3. diff --git a/libraries/aubio/aubio.SlackBuild b/libraries/aubio/aubio.SlackBuild index 48e8c876be..cce8c872ac 100644 --- a/libraries/aubio/aubio.SlackBuild +++ b/libraries/aubio/aubio.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for aubio # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2018-2019 Matteo Bernardini, Pisa, Italy +# Copyright 2018-2024 Matteo Bernardini, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -31,8 +31,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=aubio -VERSION=${VERSION:-0.4.9} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20240102_152d681} +WAFVER=${WAFVER:-2.0.26} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,7 +74,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION-2 -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -82,6 +83,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + +patch -p1 < $CWD/ffmpeg7.patch + +install -m 0755 $CWD/waf-$WAFVER waf + # Fix detecting ffmpeg sed -i "s|'HAVE_' + i in ctx.env.define_key|'HAVE_' + i in ctx.env|" \ wscript || exit 1 @@ -116,6 +121,8 @@ cd .. cp -a $PRGNAM-$VERSION $PRGNAM-$VERSION-2 cd - +export CFLAGS="$SLKCFLAGS -fpermissive" + if $(python2 -c 'import numpy' 2>/dev/null); then python2 setup.py install --root=$PKG fi diff --git a/libraries/aubio/aubio.info b/libraries/aubio/aubio.info index c5d084ea72..aa912abca8 100644 --- a/libraries/aubio/aubio.info +++ b/libraries/aubio/aubio.info @@ -1,8 +1,10 @@ PRGNAM="aubio" -VERSION="0.4.9" +VERSION="20240102_152d681" HOMEPAGE="https://aubio.org/" -DOWNLOAD="https://aubio.org/pub/aubio-0.4.9.tar.bz2" -MD5SUM="50c9c63b15a2692378af5d602892f16a" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/aubio-20240102_152d681.tar.xz \ + https://ponce.cc/slackware/sources/repo/waf-2.0.26" +MD5SUM="6ada0f768d8b78308f842d8e8862c325 \ + 730623b05efa37980aa15ff34a02e990" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/aubio/ffmpeg7.patch b/libraries/aubio/ffmpeg7.patch new file mode 100644 index 0000000000..cf0fe6ed68 --- /dev/null +++ b/libraries/aubio/ffmpeg7.patch @@ -0,0 +1,15 @@ +diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c +index 71ea8b5f..ad91f5eb 100644 +--- a/src/io/source_avcodec.c ++++ b/src/io/source_avcodec.c +@@ -345,8 +345,8 @@ void aubio_source_avcodec_reset_resampler(aubio_source_avcodec_t * s) + av_channel_layout_default(&input_layout, s->input_channels); + av_channel_layout_default(&output_layout, s->input_channels); + +- av_opt_set_chlayout(avr, "in_channel_layout", &input_layout, 0); +- av_opt_set_chlayout(avr, "out_channel_layout", &output_layout, 0); ++ av_opt_set_chlayout(avr, "in_chlayout", &input_layout, 0); ++ av_opt_set_chlayout(avr, "out_chlayout", &output_layout, 0); + #else + int64_t input_layout = av_get_default_channel_layout(s->input_channels); + int64_t output_layout = av_get_default_channel_layout(s->input_channels); diff --git a/libraries/bamf/add_compile_warning_flags.patch b/libraries/bamf/add_compile_warning_flags.patch deleted file mode 100644 index 203ccc75d3..0000000000 --- a/libraries/bamf/add_compile_warning_flags.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=940164 - -diff -Naur bamf-0.5.4.orig/configure.ac bamf-0.5.4/configure.ac ---- bamf-0.5.4.orig/configure.ac 2018-11-07 23:39:11.355315678 +0100 -+++ bamf-0.5.4/configure.ac 2019-11-18 12:57:04.534000000 +0100 -@@ -18,14 +18,15 @@ - GNOME_COMPILE_WARNINGS(maximum) - - AM_MAINTAINER_MODE --AM_DISABLE_STATIC --AM_PROG_LIBTOOL - AC_ISC_POSIX - AC_SUBST(ACLOCAL_AMFLAFS, "$ACLOCAL_FLAGS -I m4") - - PKG_PROG_PKG_CONFIG - if test "x$PKG_CONFIG" = "x"; then AC_MSG_ERROR([You need to install pkg-config]); fi - -+LT_INIT([disable-static]) -+LT_LIB_M -+ - # Checks for programs. - AC_PROG_CC - AM_PROG_CC_C_O -@@ -154,8 +155,39 @@ - # - AM_PATH_GTK_3_0 - -+# Compile warnings -+AC_ARG_ENABLE(compile-warnings, -+ AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], -+ [Trun on compiler warnings]),, -+ [enable_compile_warnings=maximum]) -+ -+warning_flags= -+ -+case "$enable_compile_warnings" in -+no) -+warning_flags= -+;; -+minimum) -+warning_flags="-Wall" -+;; -+yes) -+warning_flags="-wall -Wno-error=deprecated-declarations" -+;; -+maximum|error) -+warning_flags="-Wall -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration" -+if test "$enable_compile_warnings" = "error" ; then -+ warning_flags="$warning_flags -Werror" -+fi -+;; -+*) -+AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) -+;; -+esac -+AC_MSG_CHECKING(what warning flags to pass to the C compiler) -+AC_MSG_RESULT($warning_flags) -+ - dnl CFLAGS --CFLAGS="$CFLAGS -Wall -Werror -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm" -+CFLAGS="$CFLAGS $warning_flags $LIBM" - - AC_SUBST(BAMFDAEMON_CFLAGS) - AC_SUBST(BAMFDAEMON_LIBS) -@@ -190,5 +222,6 @@ - Headless tests: ${enable_headless_tests} - Coverage Reporting: ${use_gcov} - Export actions menus: ${enable_export_actions_menu} -+ Compiler Flags: ${CFLAGS} - - EOF diff --git a/libraries/bamf/bamf-no-gtester2xunit.patch b/libraries/bamf/bamf-no-gtester2xunit.patch new file mode 100644 index 0000000000..5c1e0fcd74 --- /dev/null +++ b/libraries/bamf/bamf-no-gtester2xunit.patch @@ -0,0 +1,22 @@ +diff -Naur bamf-0.5.6.orig/configure.ac bamf-0.5.6/configure.ac +--- bamf-0.5.6.orig/configure.ac 2022-02-17 19:16:55.346057503 +0100 ++++ bamf-0.5.6/configure.ac 2023-02-04 19:24:42.506720000 +0100 +@@ -106,18 +106,6 @@ + GTK_DOC_CHECK(1.0) + + ########################### +-# gtester2xunit checks # +-########################### +- +-AC_PATH_PROG([PYTHON],[python3]) +-AC_MSG_CHECKING(for gtester2xunit dependencies) +-if !($PYTHON -c "from lxml import etree" 2> /dev/null); then +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([You need to install python3-lxml]); +-fi +-AC_MSG_RESULT([yes]) +- +-########################### + # Headless tests + ########################### + AC_ARG_ENABLE([headless-tests], diff --git a/libraries/bamf/bamf.SlackBuild b/libraries/bamf/bamf.SlackBuild index a381620ac1..38d46e792a 100644 --- a/libraries/bamf/bamf.SlackBuild +++ b/libraries/bamf/bamf.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bamf -VERSION=${VERSION:-0.5.4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.5.6} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,7 +80,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/add_compile_warning_flags.patch +patch -p1 < $CWD/bamf-no-gtester2xunit.patch autoreconf -vif CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/bamf/bamf.info b/libraries/bamf/bamf.info index 1effbc4410..b57453a2fe 100644 --- a/libraries/bamf/bamf.info +++ b/libraries/bamf/bamf.info @@ -1,8 +1,8 @@ PRGNAM="bamf" -VERSION="0.5.4" +VERSION="0.5.6" HOMEPAGE="https://launchpad.net/bamf" -DOWNLOAD="https://launchpad.net/bamf/0.5/0.5.4/+download/bamf-0.5.4.tar.gz" -MD5SUM="e5078ec8f6c8a9d77242010dcd3b3217" +DOWNLOAD="https://launchpad.net/bamf/0.5/0.5.6/+download/bamf-0.5.6.tar.gz" +MD5SUM="49ed19dd5db0b4109f4dc2e4fe2ed13d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gnome-common" diff --git a/libraries/bitsery/bitsery.SlackBuild b/libraries/bitsery/bitsery.SlackBuild index fe30f33c75..83045f74fd 100644 --- a/libraries/bitsery/bitsery.SlackBuild +++ b/libraries/bitsery/bitsery.SlackBuild @@ -67,6 +67,7 @@ cd build cmake \ -DBITSERY_BUILD_TESTS=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=None .. make make install DESTDIR=$PKG diff --git a/libraries/bullet/bullet.SlackBuild b/libraries/bullet/bullet.SlackBuild index 1e1e1ff69b..df2dea2207 100644 --- a/libraries/bullet/bullet.SlackBuild +++ b/libraries/bullet/bullet.SlackBuild @@ -87,6 +87,7 @@ cd build -DINSTALL_LIBS=ON \ -DINSTALL_EXTRA_LIBS=ON \ -DUSE_DOUBLE_PRECISION=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/c-blosc/c-blosc.SlackBuild b/libraries/c-blosc/c-blosc.SlackBuild index 053ec8aedb..8a1a099662 100644 --- a/libraries/c-blosc/c-blosc.SlackBuild +++ b/libraries/c-blosc/c-blosc.SlackBuild @@ -89,6 +89,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ -DBUILD_STATIC=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/chromaprint/chromaprint.SlackBuild b/libraries/chromaprint/chromaprint.SlackBuild index 3b01f015bc..44e4056383 100644 --- a/libraries/chromaprint/chromaprint.SlackBuild +++ b/libraries/chromaprint/chromaprint.SlackBuild @@ -83,6 +83,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/patches/ffmpeg5.patch +patch -p1 < $CWD/patches/aa67c95b.patch +patch -p1 < $CWD/patches/ffmpeg7.patch + mkdir -p build cd build cmake \ @@ -91,6 +95,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ $tools \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/chromaprint/patches/aa67c95b.patch b/libraries/chromaprint/patches/aa67c95b.patch new file mode 100644 index 0000000000..ecfa7d05dd --- /dev/null +++ b/libraries/chromaprint/patches/aa67c95b.patch @@ -0,0 +1,50 @@ +From 82781d02cd3063d071a501218297a90bde9a314f Mon Sep 17 00:00:00 2001 +From: Marshal Walker +Date: Thu, 8 Dec 2022 11:53:58 -0500 +Subject: [PATCH] ffmpeg5 fix for issue #122 + +tested on Arch Linux, needs testing on win/mac/etc (should be fine tho) +--- + src/audio/ffmpeg_audio_processor_swresample.h | 4 ++-- + src/audio/ffmpeg_audio_reader.h | 5 +++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/audio/ffmpeg_audio_processor_swresample.h b/src/audio/ffmpeg_audio_processor_swresample.h +index b1d4bea..e8fcb3f 100644 +--- a/src/audio/ffmpeg_audio_processor_swresample.h ++++ b/src/audio/ffmpeg_audio_processor_swresample.h +@@ -29,7 +29,7 @@ class FFmpegAudioProcessor { + } + + void SetInputChannelLayout(AVChannelLayout *channel_layout) { +- av_opt_set_int(m_swr_ctx, "in_channel_layout", channel_layout->u.mask, 0); ++ av_opt_set_chlayout(m_swr_ctx, "in_chlayout", channel_layout, 0); + } + + void SetInputSampleFormat(AVSampleFormat sample_format) { +@@ -41,7 +41,7 @@ class FFmpegAudioProcessor { + } + + void SetOutputChannelLayout(AVChannelLayout *channel_layout) { +- av_opt_set_int(m_swr_ctx, "out_channel_layout", channel_layout->u.mask, 0); ++ av_opt_set_chlayout(m_swr_ctx, "out_chlayout", channel_layout, 0); + } + + void SetOutputSampleFormat(AVSampleFormat sample_format) { +diff --git a/src/audio/ffmpeg_audio_reader.h b/src/audio/ffmpeg_audio_reader.h +index 1c6b346..35b2934 100644 +--- a/src/audio/ffmpeg_audio_reader.h ++++ b/src/audio/ffmpeg_audio_reader.h +@@ -301,9 +301,10 @@ inline bool FFmpegAudioReader::Read(const int16_t **data, size_t *size) { + } else { + m_has_more_frames = false; + } ++ } else { ++ SetError("Error decoding the audio source", ret); ++ return false; + } +- SetError("Error decoding the audio source", ret); +- return false; + } + + if (m_frame->nb_samples > 0) { diff --git a/libraries/chromaprint/patches/ffmpeg5.patch b/libraries/chromaprint/patches/ffmpeg5.patch new file mode 100644 index 0000000000..97fc074885 --- /dev/null +++ b/libraries/chromaprint/patches/ffmpeg5.patch @@ -0,0 +1,550 @@ +From 8ccad6937177b1b92e40ab8f4447ea27bac009a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= +Date: Fri, 4 Nov 2022 21:47:38 +0100 +Subject: [PATCH] Use FFmpeg 5.x (#120) + +* Use FFmpeg 5.1.2 for CI builds + +* Build on Ubuntu 20.04 + +* Upgrade code to FFmpeg 5.x APIs + +* Only set FFmpeg include dirs if building tools + +* No longer needed + +* Use ubuntu 20.04 +--- + .github/workflows/build.yml | 6 +- + CMakeLists.txt | 16 -- + package/build.sh | 4 +- + src/audio/ffmpeg_audio_processor.h | 2 - + src/audio/ffmpeg_audio_processor_avresample.h | 72 ------- + src/audio/ffmpeg_audio_processor_swresample.h | 18 +- + src/audio/ffmpeg_audio_reader.h | 197 +++++++++--------- + tests/CMakeLists.txt | 6 + + 8 files changed, 122 insertions(+), 199 deletions(-) + delete mode 100644 src/audio/ffmpeg_audio_processor_avresample.h + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f8d6a32..4da2405 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,9 +84,6 @@ find_package(FFmpeg) + if(FFMPEG_LIBRARIES) + cmake_push_check_state(RESET) + set(CMAKE_REQUIRED_LIBRARIES ${FFMPEG_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lm) +- check_function_exists(av_packet_unref HAVE_AV_PACKET_UNREF) +- check_function_exists(av_frame_alloc HAVE_AV_FRAME_ALLOC) +- check_function_exists(av_frame_free HAVE_AV_FRAME_FREE) + cmake_pop_check_state() + endif() + +@@ -163,14 +160,11 @@ message(STATUS "Using ${FFT_LIB} for FFT calculations") + if(NOT AUDIO_PROCESSOR_LIB) + if(FFMPEG_LIBSWRESAMPLE_FOUND) + set(AUDIO_PROCESSOR_LIB "swresample") +- elseif(FFMPEG_LIBAVRESAMPLE_FOUND) +- set(AUDIO_PROCESSOR_LIB "avresample") + endif() + endif() + + if(AUDIO_PROCESSOR_LIB STREQUAL "swresample") + if(FFMPEG_LIBSWRESAMPLE_FOUND) +- set(USE_AVRESAMPLE OFF) + set(USE_SWRESAMPLE ON) + set(AUDIO_PROCESSOR_LIBRARIES ${FFMPEG_LIBSWRESAMPLE_LIBRARIES}) + set(AUDIO_PROCESSOR_INCLUDE_DIRS ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}) +@@ -178,16 +172,6 @@ if(AUDIO_PROCESSOR_LIB STREQUAL "swresample") + message(FATAL_ERROR "Selected ${AUDIO_PROCESSOR_LIB} for audio processing, but the library is not found") + endif() + message(STATUS "Using ${AUDIO_PROCESSOR_LIB} for audio conversion") +-elseif(AUDIO_PROCESSOR_LIB STREQUAL "avresample") +- if(FFMPEG_LIBAVRESAMPLE_FOUND) +- set(USE_AVRESAMPLE ON) +- set(USE_SWRESAMPLE OFF) +- set(AUDIO_PROCESSOR_LIBRARIES ${FFMPEG_LIBAVRESAMPLE_LIBRARIES}) +- set(AUDIO_PROCESSOR_INCLUDE_DIRS ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}) +- else() +- message(FATAL_ERROR "Selected ${AUDIO_PROCESSOR_LIB} for audio processing, but the library is not found") +- endif() +- message(STATUS "Using ${AUDIO_PROCESSOR_LIB} for audio conversion") + else() + message(STATUS "Building without audio conversion support, please install FFmpeg with libswresample") + endif() +diff --git a/src/audio/ffmpeg_audio_processor.h b/src/audio/ffmpeg_audio_processor.h +index 7628fc7..39f4f6d 100644 +--- a/src/audio/ffmpeg_audio_processor.h ++++ b/src/audio/ffmpeg_audio_processor.h +@@ -10,8 +10,6 @@ + + #if defined(USE_SWRESAMPLE) + #include "audio/ffmpeg_audio_processor_swresample.h" +-#elif defined(USE_AVRESAMPLE) +-#include "audio/ffmpeg_audio_processor_avresample.h" + #else + #error "no audio processing library" + #endif +diff --git a/src/audio/ffmpeg_audio_processor_avresample.h b/src/audio/ffmpeg_audio_processor_avresample.h +deleted file mode 100644 +index bd85f92..0000000 +--- a/src/audio/ffmpeg_audio_processor_avresample.h ++++ /dev/null +@@ -1,72 +0,0 @@ +-// Copyright (C) 2016 Lukas Lalinsky +-// Distributed under the MIT license, see the LICENSE file for details. +- +-#ifndef CHROMAPRINT_AUDIO_FFMPEG_AUDIO_PROCESSOR_AVRESAMPLE_H_ +-#define CHROMAPRINT_AUDIO_FFMPEG_AUDIO_PROCESSOR_AVRESAMPLE_H_ +- +-extern "C" { +-#include +-} +- +-namespace chromaprint { +- +-class FFmpegAudioProcessor { +-public: +- FFmpegAudioProcessor() { +- m_resample_ctx = avresample_alloc_context(); +- } +- +- ~FFmpegAudioProcessor() { +- avresample_free(&m_resample_ctx); +- } +- +- void SetCompatibleMode() { +- av_opt_set_int(m_resample_ctx, "filter_size", 16, 0); +- av_opt_set_int(m_resample_ctx, "phase_shift", 8, 0); +- av_opt_set_int(m_resample_ctx, "linear_interp", 1, 0); +- av_opt_set_double(m_resample_ctx, "cutoff", 0.8, 0); +- } +- +- void SetInputChannelLayout(int64_t channel_layout) { +- av_opt_set_int(m_resample_ctx, "in_channel_layout", channel_layout, 0); +- } +- +- void SetInputSampleFormat(AVSampleFormat sample_format) { +- av_opt_set_int(m_resample_ctx, "in_sample_fmt", sample_format, 0); +- } +- +- void SetInputSampleRate(int sample_rate) { +- av_opt_set_int(m_resample_ctx, "in_sample_rate", sample_rate, 0); +- } +- +- void SetOutputChannelLayout(int64_t channel_layout) { +- av_opt_set_int(m_resample_ctx, "out_channel_layout", channel_layout, 0); +- } +- +- void SetOutputSampleFormat(AVSampleFormat sample_format) { +- av_opt_set_int(m_resample_ctx, "out_sample_fmt", sample_format, 0); +- } +- +- void SetOutputSampleRate(int sample_rate) { +- av_opt_set_int(m_resample_ctx, "out_sample_fmt", sample_rate, 0); +- } +- +- int Init() { +- return avresample_open(m_resample_ctx); +- } +- +- int Convert(uint8_t **out, int out_count, const uint8_t **in, int in_count) { +- return avresample_convert(m_resample_ctx, out, 0, out_count, (uint8_t **) in, 0, in_count); +- } +- +- int Flush(uint8_t **out, int out_count) { +- return avresample_read(m_resample_ctx, out, out_count); +- } +- +-private: +- AVAudioResampleContext *m_resample_ctx = nullptr; +-}; +- +-}; // namespace chromaprint +- +-#endif +diff --git a/src/audio/ffmpeg_audio_processor_swresample.h b/src/audio/ffmpeg_audio_processor_swresample.h +index b86266b..b1d4bea 100644 +--- a/src/audio/ffmpeg_audio_processor_swresample.h ++++ b/src/audio/ffmpeg_audio_processor_swresample.h +@@ -28,30 +28,28 @@ class FFmpegAudioProcessor { + av_opt_set_double(m_swr_ctx, "cutoff", 0.8, 0); + } + +- void SetInputChannelLayout(int64_t channel_layout) { +- av_opt_set_int(m_swr_ctx, "icl", channel_layout, 0); +- av_opt_set_int(m_swr_ctx, "ich", av_get_channel_layout_nb_channels(channel_layout), 0); ++ void SetInputChannelLayout(AVChannelLayout *channel_layout) { ++ av_opt_set_int(m_swr_ctx, "in_channel_layout", channel_layout->u.mask, 0); + } + + void SetInputSampleFormat(AVSampleFormat sample_format) { +- av_opt_set_int(m_swr_ctx, "isf", sample_format, 0); ++ av_opt_set_sample_fmt(m_swr_ctx, "in_sample_fmt", sample_format, 0); + } + + void SetInputSampleRate(int sample_rate) { +- av_opt_set_int(m_swr_ctx, "isr", sample_rate, 0); ++ av_opt_set_int(m_swr_ctx, "in_sample_rate", sample_rate, 0); + } + +- void SetOutputChannelLayout(int64_t channel_layout) { +- av_opt_set_int(m_swr_ctx, "ocl", channel_layout, 0); +- av_opt_set_int(m_swr_ctx, "och", av_get_channel_layout_nb_channels(channel_layout), 0); ++ void SetOutputChannelLayout(AVChannelLayout *channel_layout) { ++ av_opt_set_int(m_swr_ctx, "out_channel_layout", channel_layout->u.mask, 0); + } + + void SetOutputSampleFormat(AVSampleFormat sample_format) { +- av_opt_set_int(m_swr_ctx, "osf", sample_format, 0); ++ av_opt_set_sample_fmt(m_swr_ctx, "out_sample_fmt", sample_format, 0); + } + + void SetOutputSampleRate(int sample_rate) { +- av_opt_set_int(m_swr_ctx, "osr", sample_rate, 0); ++ av_opt_set_int(m_swr_ctx, "out_sample_rate", sample_rate, 0); + } + + int Init() { +diff --git a/src/audio/ffmpeg_audio_reader.h b/src/audio/ffmpeg_audio_reader.h +index 5550164..1c6b346 100644 +--- a/src/audio/ffmpeg_audio_reader.h ++++ b/src/audio/ffmpeg_audio_reader.h +@@ -62,7 +62,7 @@ class FFmpegAudioReader { + bool Read(const int16_t **data, size_t *size); + + bool IsOpen() const { return m_opened; } +- bool IsFinished() const { return m_finished && !m_got_frame; } ++ bool IsFinished() const { return !m_has_more_packets && !m_has_more_frames; } + + std::string GetError() const { return m_error; } + int GetErrorCode() const { return m_error_code; } +@@ -74,20 +74,19 @@ class FFmpegAudioReader { + uint8_t *m_convert_buffer[1] = { nullptr }; + int m_convert_buffer_nb_samples = 0; + +- AVInputFormat *m_input_fmt = nullptr; ++ const AVInputFormat *m_input_fmt = nullptr; + AVDictionary *m_input_opts = nullptr; + + AVFormatContext *m_format_ctx = nullptr; + AVCodecContext *m_codec_ctx = nullptr; +- AVFrame *m_frame = nullptr; + int m_stream_index = -1; + std::string m_error; + int m_error_code = 0; +- bool m_finished = false; + bool m_opened = false; +- int m_got_frame = 0; +- AVPacket m_packet; +- AVPacket m_packet0; ++ bool m_has_more_packets = true; ++ bool m_has_more_frames = true; ++ AVPacket *m_packet = nullptr; ++ AVFrame *m_frame = nullptr; + + int m_output_sample_rate = 0; + int m_output_channels = 0; +@@ -98,19 +97,12 @@ class FFmpegAudioReader { + + inline FFmpegAudioReader::FFmpegAudioReader() { + av_log_set_level(AV_LOG_QUIET); +- +- av_init_packet(&m_packet); +- m_packet.data = nullptr; +- m_packet.size = 0; +- +- m_packet0 = m_packet; + } + + inline FFmpegAudioReader::~FFmpegAudioReader() { + Close(); + av_dict_free(&m_input_opts); + av_freep(&m_convert_buffer[0]); +- av_packet_unref(&m_packet0); + } + + inline bool FFmpegAudioReader::SetInputFormat(const char *name) { +@@ -135,11 +127,10 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + + Close(); + +- av_init_packet(&m_packet); +- m_packet.data = nullptr; +- m_packet.size = 0; +- +- m_packet0 = m_packet; ++ m_packet = av_packet_alloc(); ++ if (!m_packet) { ++ return false; ++ } + + ret = avformat_open_input(&m_format_ctx, file_name.c_str(), m_input_fmt, &m_input_opts); + if (ret < 0) { +@@ -153,26 +144,31 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + return false; + } + +- AVCodec *codec; ++ const AVCodec *codec; + ret = av_find_best_stream(m_format_ctx, AVMEDIA_TYPE_AUDIO, -1, -1, &codec, 0); + if (ret < 0) { + SetError("Could not find any audio stream in the file", ret); + return false; + } + m_stream_index = ret; ++ auto stream = m_format_ctx->streams[m_stream_index]; + +- m_codec_ctx = m_format_ctx->streams[m_stream_index]->codec; ++ m_codec_ctx = avcodec_alloc_context3(codec); + m_codec_ctx->request_sample_fmt = AV_SAMPLE_FMT_S16; + ++ ret = avcodec_parameters_to_context(m_codec_ctx, stream->codecpar); ++ if (ret < 0) { ++ SetError("Could not copy the stream parameters", ret); ++ return false; ++ } ++ + ret = avcodec_open2(m_codec_ctx, codec, nullptr); + if (ret < 0) { + SetError("Could not open the codec", ret); + return false; + } + +- if (!m_codec_ctx->channel_layout) { +- m_codec_ctx->channel_layout = av_get_default_channel_layout(m_codec_ctx->channels); +- } ++ av_dump_format(m_format_ctx, 0, "foo", 0); + + m_frame = av_frame_alloc(); + if (!m_frame) { +@@ -183,19 +179,23 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + m_output_sample_rate = m_codec_ctx->sample_rate; + } + +- if (!m_output_channels) { +- m_output_channels = m_codec_ctx->channels; ++ AVChannelLayout output_channel_layout; ++ if (m_output_channels) { ++ av_channel_layout_default(&output_channel_layout, m_output_channels); ++ } else { ++ m_output_channels = m_codec_ctx->ch_layout.nb_channels; ++ av_channel_layout_default(&output_channel_layout, m_output_channels); + } + +- if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16 || m_codec_ctx->channels != m_output_channels || m_codec_ctx->sample_rate != m_output_sample_rate) { ++ if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16 || m_codec_ctx->ch_layout.nb_channels != m_output_channels || m_codec_ctx->sample_rate != m_output_sample_rate) { + m_converter.reset(new FFmpegAudioProcessor()); + m_converter->SetCompatibleMode(); + m_converter->SetInputSampleFormat(m_codec_ctx->sample_fmt); + m_converter->SetInputSampleRate(m_codec_ctx->sample_rate); +- m_converter->SetInputChannelLayout(m_codec_ctx->channel_layout); ++ m_converter->SetInputChannelLayout(&(m_codec_ctx->ch_layout)); + m_converter->SetOutputSampleFormat(AV_SAMPLE_FMT_S16); + m_converter->SetOutputSampleRate(m_output_sample_rate); +- m_converter->SetOutputChannelLayout(av_get_default_channel_layout(m_output_channels)); ++ m_converter->SetOutputChannelLayout(&output_channel_layout); + auto ret = m_converter->Init(); + if (ret != 0) { + SetError("Could not create an audio converter instance", ret); +@@ -203,10 +203,11 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + } + } + ++ av_channel_layout_uninit(&output_channel_layout); ++ + m_opened = true; +- m_finished = false; +- m_got_frame = 0; +- m_nb_packets = 0; ++ m_has_more_packets = true; ++ m_has_more_frames = true; + m_decode_error = 0; + + return true; +@@ -214,6 +215,7 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + + inline void FFmpegAudioReader::Close() { + av_frame_free(&m_frame); ++ av_packet_free(&m_packet); + + m_stream_index = -1; + +@@ -252,91 +254,98 @@ inline bool FFmpegAudioReader::Read(const int16_t **data, size_t *size) { + return false; + } + ++ *data = nullptr; ++ *size = 0; ++ + int ret; ++ bool needs_packet = false; + while (true) { +- while (m_packet.size <= 0) { +- av_packet_unref(&m_packet0); +- av_init_packet(&m_packet); +- m_packet.data = nullptr; +- m_packet.size = 0; +- ret = av_read_frame(m_format_ctx, &m_packet); ++ while (needs_packet && m_packet->size == 0) { ++ ret = av_read_frame(m_format_ctx, m_packet); + if (ret < 0) { + if (ret == AVERROR_EOF) { +- m_finished = true; ++ needs_packet = false; ++ m_has_more_packets = false; + break; +- } else { ++ } ++ SetError("Error reading from the audio source", ret); ++ return false; ++ } ++ if (m_packet->stream_index == m_stream_index) { ++ needs_packet = false; ++ } else { ++ av_packet_unref(m_packet); ++ } ++ } ++ ++ if (m_packet->size != 0) { ++ ret = avcodec_send_packet(m_codec_ctx, m_packet); ++ if (ret < 0) { ++ if (ret != AVERROR(EAGAIN)) { + SetError("Error reading from the audio source", ret); + return false; + } +- } +- m_packet0 = m_packet; +- if (m_packet.stream_index != m_stream_index) { +- m_packet.data = nullptr; +- m_packet.size = 0; + } else { +- m_nb_packets++; ++ av_packet_unref(m_packet); + } + } + +- ret = avcodec_decode_audio4(m_codec_ctx, m_frame, &m_got_frame, &m_packet); ++ ret = avcodec_receive_frame(m_codec_ctx, m_frame); + if (ret < 0) { +- if (m_decode_error) { +- SetError("Error decoding audio frame", m_decode_error); +- return false; ++ if (ret == AVERROR_EOF) { ++ m_has_more_frames = false; ++ } else if (ret == AVERROR(EAGAIN)) { ++ if (m_has_more_packets) { ++ needs_packet = true; ++ continue; ++ } else { ++ m_has_more_frames = false; ++ } + } +- m_decode_error = ret; +- m_packet.data = nullptr; +- m_packet.size = 0; +- continue; ++ SetError("Error decoding the audio source", ret); ++ return false; + } + +- break; +- } +- +- m_decode_error = 0; +- +- const int decoded = std::min(ret, m_packet.size); +- m_packet.data += decoded; +- m_packet.size -= decoded; +- +- if (m_got_frame) { +- if (m_converter) { +- if (m_frame->nb_samples > m_convert_buffer_nb_samples) { +- int linsize; +- av_freep(&m_convert_buffer[0]); +- m_convert_buffer_nb_samples = std::max(1024 * 8, m_frame->nb_samples); +- ret = av_samples_alloc(m_convert_buffer, &linsize, m_codec_ctx->channels, m_convert_buffer_nb_samples, AV_SAMPLE_FMT_S16, 1); +- if (ret < 0) { +- SetError("Couldn't allocate audio converter buffer", ret); ++ if (m_frame->nb_samples > 0) { ++ if (m_converter) { ++ if (m_frame->nb_samples > m_convert_buffer_nb_samples) { ++ int linsize; ++ av_freep(&m_convert_buffer[0]); ++ m_convert_buffer_nb_samples = std::max(1024 * 8, m_frame->nb_samples); ++ ret = av_samples_alloc(m_convert_buffer, &linsize, m_codec_ctx->ch_layout.nb_channels, m_convert_buffer_nb_samples, AV_SAMPLE_FMT_S16, 1); ++ if (ret < 0) { ++ SetError("Couldn't allocate audio converter buffer", ret); ++ return false; ++ } ++ } ++ auto nb_samples = m_converter->Convert(m_convert_buffer, m_convert_buffer_nb_samples, (const uint8_t **) m_frame->data, m_frame->nb_samples); ++ if (nb_samples < 0) { ++ SetError("Couldn't convert audio", ret); + return false; + } +- } +- auto nb_samples = m_converter->Convert(m_convert_buffer, m_convert_buffer_nb_samples, (const uint8_t **) m_frame->data, m_frame->nb_samples); +- if (nb_samples < 0) { +- SetError("Couldn't convert audio", ret); +- return false; +- } +- *data = (const int16_t *) m_convert_buffer[0]; +- *size = nb_samples; +- } else { +- *data = (const int16_t *) m_frame->data[0]; +- *size = m_frame->nb_samples; +- } +- } else { +- if (m_finished && m_converter) { +- auto nb_samples = m_converter->Flush(m_convert_buffer, m_convert_buffer_nb_samples); +- if (nb_samples < 0) { +- SetError("Couldn't convert audio", ret); +- return false; +- } else if (nb_samples > 0) { +- m_got_frame = 1; + *data = (const int16_t *) m_convert_buffer[0]; + *size = nb_samples; ++ } else { ++ *data = (const int16_t *) m_frame->data[0]; ++ *size = m_frame->nb_samples; ++ } ++ } else { ++ if (m_converter) { ++ if (IsFinished()) { ++ auto nb_samples = m_converter->Flush(m_convert_buffer, m_convert_buffer_nb_samples); ++ if (nb_samples < 0) { ++ SetError("Couldn't convert audio", ret); ++ return false; ++ } else if (nb_samples > 0) { ++ *data = (const int16_t *) m_convert_buffer[0]; ++ *size = nb_samples; ++ } ++ } + } + } +- } + +- return true; ++ return true; ++ } + } + + inline void FFmpegAudioReader::SetError(const char *message, int errnum) { +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index a2b517b..123e643 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -38,6 +38,12 @@ set(SRCS + + if(BUILD_TOOLS) + set(SRCS ${SRCS} ../src/audio/ffmpeg_audio_reader_test.cpp) ++ include_directories( ++ ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ++ ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ++ ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ++ ${AUDIO_PROCESSOR_INCLUDE_DIRS} ++ ) + link_libraries(fpcalc_libs) + endif() + diff --git a/libraries/chromaprint/patches/ffmpeg7.patch b/libraries/chromaprint/patches/ffmpeg7.patch new file mode 100644 index 0000000000..5618f8c98b --- /dev/null +++ b/libraries/chromaprint/patches/ffmpeg7.patch @@ -0,0 +1,20 @@ +diff --git a/src/audio/ffmpeg_audio_reader.h b/src/audio/ffmpeg_audio_reader.h +index 35b2934..0b032e5 100644 +--- a/src/audio/ffmpeg_audio_reader.h ++++ b/src/audio/ffmpeg_audio_reader.h +@@ -118,8 +118,13 @@ inline bool FFmpegAudioReader::SetInputSampleRate(int sample_rate) { + + inline bool FFmpegAudioReader::SetInputChannels(int channels) { + char buf[64]; +- sprintf(buf, "%d", channels); +- return av_dict_set(&m_input_opts, "channels", buf, 0) >= 0; ++ if (channels == 1) ++ sprintf(buf, "%s", "mono"); ++ else if (channels == 2) ++ sprintf(buf, "%s", "stereo"); ++ else ++ return false; ++ return av_dict_set(&m_input_opts, "ch_layout", buf, 0) >= 0; + } + + inline bool FFmpegAudioReader::Open(const std::string &file_name) { diff --git a/libraries/cmark/README b/libraries/cmark/README deleted file mode 100644 index 1740df5692..0000000000 --- a/libraries/cmark/README +++ /dev/null @@ -1,10 +0,0 @@ -cmark is the C reference implementation of CommonMark, a rationalized -version of Markdown syntax with a spec. (For the JavaScript reference -implementation, see commonmark.js.) - -It provides a shared library (libcmark) with functions for parsing -CommonMark documents to an abstract syntax tree (AST), manipulating -the AST, and rendering the document to HTML, groff man, LaTeX, -CommonMark, or an XML representation of the AST. It also provides a -command-line program (cmark) for parsing and rendering CommonMark -documents. diff --git a/libraries/cmark/cmark.SlackBuild b/libraries/cmark/cmark.SlackBuild deleted file mode 100644 index 2c0d06b295..0000000000 --- a/libraries/cmark/cmark.SlackBuild +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash - -# Slackware build script for cmark - -# Copyright 2018, 2019 Skaendo -# Maintained 2024 by Jay Lanagan (j@lngn.net), Detroit, MI, 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=cmark -VERSION=${VERSION:-0.31.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_MANDIR=/usr/man \ - -DBUILD_SHARED_LIBS=YES \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING *.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/cmark/cmark.info b/libraries/cmark/cmark.info deleted file mode 100644 index f662bb89f5..0000000000 --- a/libraries/cmark/cmark.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="cmark" -VERSION="0.31.1" -HOMEPAGE="https://github.com/commonmark/cmark" -DOWNLOAD="https://github.com/commonmark/cmark/archive/0.31.1/cmark-0.31.1.tar.gz" -MD5SUM="362160f1c0457389f5ad6e9d5eaf4cfb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Jay Lanagan" -EMAIL="j@lngn.net" diff --git a/libraries/cmark/slack-desc b/libraries/cmark/slack-desc deleted file mode 100644 index e20100481a..0000000000 --- a/libraries/cmark/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -cmark: cmark (C Reference libraries) -cmark: -cmark: cmark is the C reference implementation of CommonMark, a rationalized -cmark: version of Markdown syntax with a spec. (For the JavaScript reference -cmark: implementation, see commonmark.js.) -cmark: -cmark: Homepage: https://github.com/commonmark/cmark -cmark: -cmark: -cmark: -cmark: diff --git a/libraries/coeurl/coeurl.SlackBuild b/libraries/coeurl/coeurl.SlackBuild index 9a494490fb..434e2250b4 100644 --- a/libraries/coeurl/coeurl.SlackBuild +++ b/libraries/coeurl/coeurl.SlackBuild @@ -84,6 +84,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch -p1 < $CWD/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc.patch +patch -p1 < $CWD/curlwrap.patch mkdir build cd build diff --git a/libraries/coeurl/curlwrap.patch b/libraries/coeurl/curlwrap.patch new file mode 100644 index 0000000000..1e02e2fa05 --- /dev/null +++ b/libraries/coeurl/curlwrap.patch @@ -0,0 +1,9 @@ +--- a/subprojects/curl.wrap 2025-09-30 23:32:45.714201242 -0400 ++++ b/subprojects/curl.wrap 2025-09-30 23:30:38.012198946 -0400 +@@ -5,5 +5,5 @@ + source_filename = curl-7.77.0.tar.xz + source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b + +-[provides] ++[provide] + dependency_names = libcurl diff --git a/libraries/cogl/cogl.SlackBuild b/libraries/cogl/cogl.SlackBuild index 58d6bd83b4..de09183b31 100644 --- a/libraries/cogl/cogl.SlackBuild +++ b/libraries/cogl/cogl.SlackBuild @@ -79,7 +79,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu17 -Wno-implicit-function-declaration" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/collada-dom/boost-1.85.patch b/libraries/collada-dom/boost-1.85.patch new file mode 100644 index 0000000000..c0ef9ec049 --- /dev/null +++ b/libraries/collada-dom/boost-1.85.patch @@ -0,0 +1,50 @@ +From 65222c3c4f800b624e1d547ab7f1eb28e3d6ee59 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Mon, 27 May 2024 16:13:09 +0000 +Subject: [PATCH] Fix build for boost 1.85.0, #42 + +--- + dom/include/dae.h | 2 +- + dom/src/dae/daeUtils.cpp | 2 +- + dom/src/dae/daeZAEUncompressHandler.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dom/include/dae.h b/dom/include/dae.h +index e53388b..03e72f9 100644 +--- a/dom/include/dae.h ++++ b/dom/include/dae.h +@@ -25,7 +25,7 @@ + #pragma warning(disable: 4180 4245) + #endif + #ifndef NO_BOOST +-#include ++#include + #endif + #ifdef _MSC_VER + #pragma warning(pop) +diff --git a/dom/src/dae/daeUtils.cpp b/dom/src/dae/daeUtils.cpp +index de30ca0..45b667f 100644 +--- a/dom/src/dae/daeUtils.cpp ++++ b/dom/src/dae/daeUtils.cpp +@@ -18,7 +18,7 @@ + #endif + + #ifndef NO_BOOST +-#include // THIS WAS NOT COMMENTED. ++#include // THIS WAS NOT COMMENTED. + #endif + + #include // for tmpnam +diff --git a/dom/src/dae/daeZAEUncompressHandler.cpp b/dom/src/dae/daeZAEUncompressHandler.cpp +index da2a344..2550000 100644 +--- a/dom/src/dae/daeZAEUncompressHandler.cpp ++++ b/dom/src/dae/daeZAEUncompressHandler.cpp +@@ -271,7 +271,7 @@ bool daeZAEUncompressHandler::checkAndExtractInternalArchive( const std::string& + bool error = false; + + boost::filesystem::path archivePath(filePath); +- std::string dir = archivePath.branch_path().string(); ++ std::string dir = archivePath.parent_path().string(); + + const std::string& randomSegment = cdom::getRandomFileName(); + std::string tmpDir = dir + cdom::getFileSeparator() + randomSegment + cdom::getFileSeparator(); diff --git a/libraries/collada-dom/collada-dom.SlackBuild b/libraries/collada-dom/collada-dom.SlackBuild index ce47535655..3f5cd9c0bb 100644 --- a/libraries/collada-dom/collada-dom.SlackBuild +++ b/libraries/collada-dom/collada-dom.SlackBuild @@ -66,6 +66,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch -p1 < $CWD/return-type.patch +patch -p1 < $CWD/boost-1.85.patch mkdir -p build cd build @@ -75,6 +76,8 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -W no-dev \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild b/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild index 06780bfb97..620857d696 100644 --- a/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild +++ b/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild @@ -79,6 +79,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/gcc13.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/compiz-plugins-experimental/gcc13.patch b/libraries/compiz-plugins-experimental/gcc13.patch new file mode 100644 index 0000000000..8edce5b67e --- /dev/null +++ b/libraries/compiz-plugins-experimental/gcc13.patch @@ -0,0 +1,169 @@ +https://bbs.archlinux.org/viewtopic.php?id=290483 + +diff --git a/src/anaglyph/anaglyph.c b/src/anaglyph/anaglyph.c +index 5ee0b32..94dec30 100644 +--- a/src/anaglyph/anaglyph.c ++++ b/src/anaglyph/anaglyph.c +@@ -21,6 +21,7 @@ + #include + #include "anaglyph_options.h" + ++#include + + #define GET_ANAGLYPH_CORE(c) \ + ((AnaglyphCore *) (c)->base.privates[corePrivateIndex].ptr) +diff --git a/src/atlantis/atlantis-internal.h b/src/atlantis/atlantis-internal.h +index 4b3e903..4ce80cd 100644 +--- a/src/atlantis/atlantis-internal.h ++++ b/src/atlantis/atlantis-internal.h +@@ -104,6 +104,7 @@ + + #include + #include ++#include + + /* some constants */ + #define PI M_PI +diff --git a/src/elements/elements.c b/src/elements/elements.c +index 9c3d61f..f24ebc0 100644 +--- a/src/elements/elements.c ++++ b/src/elements/elements.c +@@ -50,6 +50,9 @@ + + #include + #include "elements_options.h" ++ ++#include ++ + #define GET_DISPLAY(d) \ + ((eDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/fakeargb/fakeargb.c b/src/fakeargb/fakeargb.c +index 1c8c241..c76c1b7 100644 +--- a/src/fakeargb/fakeargb.c ++++ b/src/fakeargb/fakeargb.c +@@ -22,6 +22,8 @@ + #include + #include "fakeargb_options.h" + ++#include ++ + static int displayPrivateIndex; + + typedef struct _FakeDisplay +diff --git a/src/fireflies/fireflies.c b/src/fireflies/fireflies.c +index 6d271c2..6f7b1a9 100644 +--- a/src/fireflies/fireflies.c ++++ b/src/fireflies/fireflies.c +@@ -32,6 +32,8 @@ + #include + #include "fireflies_options.h" + ++#include ++ + #define GET_SNOW_DISPLAY(d) \ + ((SnowDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/freewins/freewins.c b/src/freewins/freewins.c +index bd55f56..fffc337 100644 +--- a/src/freewins/freewins.c ++++ b/src/freewins/freewins.c +@@ -50,6 +50,8 @@ + + #include "freewins.h" + ++#include ++ + static CompMetadata freewinsMetadata; + + /* Information on window resize */ +diff --git a/src/freewins/input.c b/src/freewins/input.c +index 96a9009..7c35d1e 100644 +--- a/src/freewins/input.c ++++ b/src/freewins/input.c +@@ -50,6 +50,8 @@ + #include "freewins.h" + #include + ++#include ++ + /* ------ Input Prevention -------------------------------------------*/ + + /* Shape the IPW +diff --git a/src/smartput/smartput.c b/src/smartput/smartput.c +index a43f4c1..05bcbf1 100644 +--- a/src/smartput/smartput.c ++++ b/src/smartput/smartput.c +@@ -50,6 +50,8 @@ + #include + #include "smartput_options.h" + ++#include ++ + typedef struct _SmartputUndoInfo { + Window window; + +diff --git a/src/snow/snow.c b/src/snow/snow.c +index 80e94aa..fb6566a 100644 +--- a/src/snow/snow.c ++++ b/src/snow/snow.c +@@ -32,6 +32,8 @@ + #include + #include "snow_options.h" + ++#include ++ + #define GET_SNOW_DISPLAY(d) \ + ((SnowDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/snowglobe/snowglobe-internal.h b/src/snowglobe/snowglobe-internal.h +index 9ca51ff..f6d89af 100644 +--- a/src/snowglobe/snowglobe-internal.h ++++ b/src/snowglobe/snowglobe-internal.h +@@ -8,6 +8,7 @@ + + #include + #include ++#include + + /* some constants */ + #define PI M_PI +diff --git a/src/stars/star.c b/src/stars/star.c +index 96a26c1..59aa7d9 100644 +--- a/src/stars/star.c ++++ b/src/stars/star.c +@@ -43,6 +43,8 @@ + #include + #include "star_options.h" + ++#include ++ + #define GET_SNOW_DISPLAY(d) \ + ((SnowDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/tile/tile.c b/src/tile/tile.c +index d58cac5..98c0ad0 100644 +--- a/src/tile/tile.c ++++ b/src/tile/tile.c +@@ -30,6 +30,8 @@ + #include + #include "tile_options.h" + ++#include ++ + static int displayPrivateIndex = 0; + + typedef enum { +diff --git a/src/wizard/wizard.c b/src/wizard/wizard.c +index d60ff94..d90f9cc 100644 +--- a/src/wizard/wizard.c ++++ b/src/wizard/wizard.c +@@ -30,6 +30,8 @@ + #include "wizard_options.h" + #include "wizard_tex.h" + ++#include ++ + #define GET_WIZARD_DISPLAY(d) \ + ((WizardDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + diff --git a/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild b/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild index baf64788ca..bd933df6ae 100644 --- a/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild +++ b/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild @@ -79,6 +79,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/gcc13.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/compiz-plugins-extra/gcc13.patch b/libraries/compiz-plugins-extra/gcc13.patch new file mode 100644 index 0000000000..5500445b4b --- /dev/null +++ b/libraries/compiz-plugins-extra/gcc13.patch @@ -0,0 +1,203 @@ +https://bbs.archlinux.org/viewtopic.php?id=290483 + +diff --git a/src/addhelper/addhelper.c b/src/addhelper/addhelper.c +index 3bc8a6b..78242e9 100644 +--- a/src/addhelper/addhelper.c ++++ b/src/addhelper/addhelper.c +@@ -24,6 +24,9 @@ + */ + + #include ++ ++#include ++ + #include "addhelper_options.h" + + #define GET_ADD_DISPLAY(d) \ +diff --git a/src/bench/bench.c b/src/bench/bench.c +index 9cdef8c..4610021 100644 +--- a/src/bench/bench.c ++++ b/src/bench/bench.c +@@ -22,6 +22,8 @@ + + #include + ++#include ++ + #include "bench_tex.h" + #include "bench_options.h" + +diff --git a/src/firepaint/firepaint.c b/src/firepaint/firepaint.c +index b147b03..cb8a508 100644 +--- a/src/firepaint/firepaint.c ++++ b/src/firepaint/firepaint.c +@@ -21,6 +21,8 @@ + + #include + ++#include ++ + #include "firepaint_options.h" + #include "firepaint_tex.h" + +diff --git a/src/grid/grid.c b/src/grid/grid.c +index a8d5152..cb827e6 100644 +--- a/src/grid/grid.c ++++ b/src/grid/grid.c +@@ -23,7 +23,10 @@ + */ + + #include ++ ++#include + #include ++ + #include "grid_options.h" + + #define GRID_DEBUG 0 +diff --git a/src/highlightcontent/highlightcontent.c b/src/highlightcontent/highlightcontent.c +index 33bf932..5d66978 100644 +--- a/src/highlightcontent/highlightcontent.c ++++ b/src/highlightcontent/highlightcontent.c +@@ -21,6 +21,7 @@ + */ + + #include ++#include + #include + + #include +diff --git a/src/loginout/loginout.c b/src/loginout/loginout.c +index e2889d2..466f7df 100644 +--- a/src/loginout/loginout.c ++++ b/src/loginout/loginout.c +@@ -21,6 +21,8 @@ + + #include + ++#include ++ + #include "loginout_options.h" + + static int displayPrivateIndex = 0; +diff --git a/src/mblur/mblur.c b/src/mblur/mblur.c +index 103cd32..4e15c6d 100644 +--- a/src/mblur/mblur.c ++++ b/src/mblur/mblur.c +@@ -20,6 +20,7 @@ + */ + + #include ++#include + + #include + +diff --git a/src/reflex/reflex.c b/src/reflex/reflex.c +index 8c6ebc3..648c9c9 100644 +--- a/src/reflex/reflex.c ++++ b/src/reflex/reflex.c +@@ -20,6 +20,8 @@ + */ + #include + ++#include ++ + #include "reflex_options.h" + + +diff --git a/src/scalefilter/scalefilter.c b/src/scalefilter/scalefilter.c +index 55e2a96..c10c5d1 100644 +--- a/src/scalefilter/scalefilter.c ++++ b/src/scalefilter/scalefilter.c +@@ -25,6 +25,7 @@ + + #define _GNU_SOURCE + #include ++#include + #include + #include + #include +diff --git a/src/shelf/shelf.c b/src/shelf/shelf.c +index cd17839..e4fd09c 100644 +--- a/src/shelf/shelf.c ++++ b/src/shelf/shelf.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include "shelf_options.h" + +diff --git a/src/showmouse/showmouse.c b/src/showmouse/showmouse.c +index fe972a2..32c3cb9 100644 +--- a/src/showmouse/showmouse.c ++++ b/src/showmouse/showmouse.c +@@ -25,6 +25,7 @@ + */ + + #include ++#include + #include + + #include +diff --git a/src/splash/splash.c b/src/splash/splash.c +index c72b9b0..986a3ec 100644 +--- a/src/splash/splash.c ++++ b/src/splash/splash.c +@@ -20,6 +20,7 @@ + */ + + #include ++#include + + #include + #include +diff --git a/src/trailfocus/trailfocus.c b/src/trailfocus/trailfocus.c +index ecfa84d..05c50f4 100644 +--- a/src/trailfocus/trailfocus.c ++++ b/src/trailfocus/trailfocus.c +@@ -25,6 +25,7 @@ + * + */ + ++#include + #include + #include + #include "trailfocus_options.h" +diff --git a/src/vidcap/vidcap.c b/src/vidcap/vidcap.c +index 10157b2..a08126d 100644 +--- a/src/vidcap/vidcap.c ++++ b/src/vidcap/vidcap.c +@@ -27,6 +27,7 @@ + + #define _GNU_SOURCE /* For asprintf */ + #include ++#include + #include + #include + #include +diff --git a/src/wallpaper/wallpaper.c b/src/wallpaper/wallpaper.c +index fd23b69..2c47fa7 100644 +--- a/src/wallpaper/wallpaper.c ++++ b/src/wallpaper/wallpaper.c +@@ -23,6 +23,7 @@ + */ + + #include ++#include + #include + #include + #include +diff --git a/src/widget/widget.c b/src/widget/widget.c +index ce7d4f0..6d146fa 100644 +--- a/src/widget/widget.c ++++ b/src/widget/widget.c +@@ -26,6 +26,7 @@ + * + */ + ++#include + #include + #include + #include diff --git a/libraries/compiz-plugins-main/compiz-plugins-main-0.8.18-gcc-14-fix.patch b/libraries/compiz-plugins-main/compiz-plugins-main-0.8.18-gcc-14-fix.patch new file mode 100644 index 0000000000..8d95b7ef0c --- /dev/null +++ b/libraries/compiz-plugins-main/compiz-plugins-main-0.8.18-gcc-14-fix.patch @@ -0,0 +1,96 @@ +diff --git a/src/mag/mag.c b/src/mag/mag.c +index f3c8fc3..6aac3a7 100644 +--- a/src/mag/mag.c ++++ b/src/mag/mag.c +@@ -20,6 +20,7 @@ + * + */ + ++#include + #include + #include + +diff --git a/src/mousepoll/mousepoll.c b/src/mousepoll/mousepoll.c +index d009ed2..eb513e1 100644 +--- a/src/mousepoll/mousepoll.c ++++ b/src/mousepoll/mousepoll.c +@@ -20,6 +20,7 @@ + * + */ + ++#include + #include + + #include "compiz-mousepoll.h" +diff --git a/src/opacify/opacify.c b/src/opacify/opacify.c +index a4fb86c..3b96208 100644 +--- a/src/opacify/opacify.c ++++ b/src/opacify/opacify.c +@@ -21,6 +21,7 @@ + * + */ + ++#include + #include + #include "opacify_options.h" + +diff --git a/src/scaleaddon/scaleaddon.c b/src/scaleaddon/scaleaddon.c +index 8029fa4..d97fe11 100644 +--- a/src/scaleaddon/scaleaddon.c ++++ b/src/scaleaddon/scaleaddon.c +@@ -24,6 +24,7 @@ + * + */ + ++#include + #include + #include + #include +diff --git a/src/session/session.c b/src/session/session.c +index 7d1d6e9..bac2c0a 100644 +--- a/src/session/session.c ++++ b/src/session/session.c +@@ -29,6 +29,7 @@ + + #include + ++#include + #include + #include + #include +diff --git a/src/vpswitch/vpswitch.c b/src/vpswitch/vpswitch.c +index 92faf48..3411671 100644 +--- a/src/vpswitch/vpswitch.c ++++ b/src/vpswitch/vpswitch.c +@@ -27,6 +27,7 @@ + */ + + #include ++#include + #include + #include + #include "vpswitch_options.h" +diff --git a/src/winrules/winrules.c b/src/winrules/winrules.c +index d64623e..8a47b0a 100644 +--- a/src/winrules/winrules.c ++++ b/src/winrules/winrules.c +@@ -21,6 +21,7 @@ + + #include + ++#include + #include + + #define WINRULES_SCREEN_OPTION_SKIPTASKBAR_MATCH 0 +diff --git a/src/workarounds/workarounds.c b/src/workarounds/workarounds.c +index 125c072..af92b26 100644 +--- a/src/workarounds/workarounds.c ++++ b/src/workarounds/workarounds.c +@@ -20,6 +20,7 @@ + * This plug-in for Marco-like workarounds. + */ + ++#include + #include + #include + diff --git a/libraries/compiz-plugins-main/compiz-plugins-main.SlackBuild b/libraries/compiz-plugins-main/compiz-plugins-main.SlackBuild index a680107e4f..1b746e0509 100644 --- a/libraries/compiz-plugins-main/compiz-plugins-main.SlackBuild +++ b/libraries/compiz-plugins-main/compiz-plugins-main.SlackBuild @@ -79,6 +79,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks DryFalls on LQ and fedora for the patch +patch -p1 < $CWD/compiz-plugins-main-0.8.18-gcc-14-fix.patch + # Fix focus position on some situations with ATK >= 2.36 patch -p1 < $CWD/fix_focus_position.patch diff --git a/libraries/dav1d/README b/libraries/dav1d/README deleted file mode 100644 index cf7b07d41c..0000000000 --- a/libraries/dav1d/README +++ /dev/null @@ -1,7 +0,0 @@ -dav1d is an AV1 decoder being developed by the VideoLAN, -with the aim of creating a fast and correct decoder to -overcome the present lack of hardware AV1 decoders. - -This SlackBuild builds the binary decoder dav1d as well -as libraries suitable for use by other applications such -as FFmpeg and VLC. diff --git a/libraries/dav1d/dav1d.SlackBuild b/libraries/dav1d/dav1d.SlackBuild deleted file mode 100644 index fc55c733c8..0000000000 --- a/libraries/dav1d/dav1d.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash -# ---------------------------------------------------------------------- -# Slackware build script for dav1d -# -# Copyright (c) 2019-2024 Andrew Strong, Blue Mountains, Australia. -# Copyright 2024-2025 Jeremy Hansen -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ---------------------------------------------------------------------- - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=dav1d -VERSION=${VERSION:-1.5.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson setup .. \ - --buildtype=release \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --prefix=/usr - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING NEWS *.md doc/PATENTS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/dav1d/dav1d.info b/libraries/dav1d/dav1d.info deleted file mode 100644 index e141d3c9c8..0000000000 --- a/libraries/dav1d/dav1d.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="dav1d" -VERSION="1.5.1" -HOMEPAGE="https://code.videolan.org/videolan/dav1d" -DOWNLOAD="https://code.videolan.org/videolan/dav1d/-/archive/1.5.1/dav1d-1.5.1.tar.gz" -MD5SUM="e919dd18e2d834abe007bdf7d973a2f0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/libraries/dav1d/slack-desc b/libraries/dav1d/slack-desc deleted file mode 100644 index b9ef7d3079..0000000000 --- a/libraries/dav1d/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -dav1d: dav1d (AV1 decoder) -dav1d: -dav1d: dav1d is an AV1 decoder focused on speed and correctness. -dav1d: -dav1d: Homepage: https://code.videolan.org/videolan/dav1d -dav1d: -dav1d: -dav1d: -dav1d: -dav1d: -dav1d: diff --git a/libraries/double-conversion/double-conversion.SlackBuild b/libraries/double-conversion/double-conversion.SlackBuild index b6ef196642..2b8e676187 100644 --- a/libraries/double-conversion/double-conversion.SlackBuild +++ b/libraries/double-conversion/double-conversion.SlackBuild @@ -85,6 +85,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_TESTING=$TESTING \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/efl/efl.SlackBuild b/libraries/efl/efl.SlackBuild index 64976bdb62..20ade73272 100644 --- a/libraries/efl/efl.SlackBuild +++ b/libraries/efl/efl.SlackBuild @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=efl -VERSION=${VERSION:-1.27.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.28.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -87,6 +84,9 @@ find -L . \ sed -i '1i msgid ""\nmsgstr ""\n"Content-Type: text/plain; charset=UTF-8"\n' src/examples/edje/*/*.po +export CFLAGS="$SLKCFLAGS -std=gnu17" +export CXXFLAGS="$SLKCFLAGS -std=gnu++17" + meson . build \ --prefix=/usr/ \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -95,14 +95,6 @@ meson . build \ -Dglib=true \ -Dbuild-id="$ARCH"-slackware-linux -# 20200416 bkw: vita_cell on IRC reported missing DSO errors for -lm -# and -ldl. efl has a LOT of optional/autodetected libraries, I couldn't -# duplicate his problem, but it looks like some optional library normally -# adds the -lm -ldl in its pkgconfig file and he was missing whatever -# it was. In any case, adding them here won't hurt anything. -LIBS="-lm -ldl" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ "${NINJA:=ninja}" -C build -v DESTDIR=$PKG $NINJA -C build install diff --git a/libraries/efl/efl.info b/libraries/efl/efl.info index 36e7549b14..6a6efd4e00 100644 --- a/libraries/efl/efl.info +++ b/libraries/efl/efl.info @@ -1,10 +1,10 @@ PRGNAM="efl" -VERSION="1.27.0" +VERSION="1.28.1" HOMEPAGE="https://www.enlightenment.org/" -DOWNLOAD="https://download.enlightenment.org/rel/libs/efl/efl-1.27.0.tar.xz" -MD5SUM="0efa0cbdb915752c99861eb91933f59f" +DOWNLOAD="https://download.enlightenment.org/rel/libs/efl/efl-1.28.1.tar.xz" +MD5SUM="08e479862cdfa5966cf7a248885673bf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="luajit bullet" +REQUIRES="lua51 bullet" MAINTAINER="Erik Falor" EMAIL="ewfalor@gmail.com" diff --git a/libraries/fcft/fcft.SlackBuild b/libraries/fcft/fcft.SlackBuild index 3b3992b00e..688cba315c 100644 --- a/libraries/fcft/fcft.SlackBuild +++ b/libraries/fcft/fcft.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fcft -VERSION=${VERSION:-3.1.6} +VERSION=${VERSION:-3.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,9 +67,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.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 \ diff --git a/libraries/fcft/fcft.info b/libraries/fcft/fcft.info index 36b88c4aeb..0e472d2c85 100644 --- a/libraries/fcft/fcft.info +++ b/libraries/fcft/fcft.info @@ -1,8 +1,8 @@ PRGNAM="fcft" -VERSION="3.1.6" +VERSION="3.3.2" HOMEPAGE="https://codeberg.org/dnkl/fcft" -DOWNLOAD="https://codeberg.org/dnkl/fcft/archive/3.1.6.tar.gz" -MD5SUM="033c9eb7a56f8f2b964def193c3be627" +DOWNLOAD="https://codeberg.org/dnkl/fcft/releases/download/3.3.2/fcft-3.3.2.tar.gz" +MD5SUM="f1d62f2ab227ca304c5138664d7c89eb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="scdoc tllist" diff --git a/libraries/fcl/fcl.SlackBuild b/libraries/fcl/fcl.SlackBuild index a2a01009d4..9de87499db 100644 --- a/libraries/fcl/fcl.SlackBuild +++ b/libraries/fcl/fcl.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fcl VERSION=${VERSION:-0.5.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,10 +83,11 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DBOOST_TIMER_ENABLE_DEPRECATED" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/ffms2/586d87de3f896d0c4ff01b21f572375e11f9c3f1.patch b/libraries/ffms2/586d87de3f896d0c4ff01b21f572375e11f9c3f1.patch deleted file mode 100644 index bae70e486e..0000000000 --- a/libraries/ffms2/586d87de3f896d0c4ff01b21f572375e11f9c3f1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 586d87de3f896d0c4ff01b21f572375e11f9c3f1 Mon Sep 17 00:00:00 2001 -From: Derek Buitenhuis -Date: Tue, 4 May 2021 14:20:47 +0100 -Subject: [PATCH] configure: Remove deprecated API use - -Signed-off-by: Derek Buitenhuis ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b35ef80bcd..d19714d0f6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -102,10 +102,10 @@ CFLAGS="$_CFLAGS $FFMPEG_CFLAGS" - - AC_DEFUN([TEST_FFMPEG], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -- #include -+ #include - #include - ]],[[ -- avcodec_register_all(); -+ avformat_network_init(); - swscale_version(); - ]])], [eval $1=yes], [eval $1=no]) - ]) diff --git a/libraries/ffms2/ffms2.SlackBuild b/libraries/ffms2/ffms2.SlackBuild index 433793dd71..69715d1d85 100644 --- a/libraries/ffms2/ffms2.SlackBuild +++ b/libraries/ffms2/ffms2.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ffms2 -VERSION=${VERSION:-2.40} -BUILD=${BUILD:-3} +VERSION=${VERSION:-5.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -75,7 +75,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -patch -p1 < $CWD/586d87de3f896d0c4ff01b21f572375e11f9c3f1.patch mkdir -p src/config autoreconf -fiv CXXFLAGS="$SLKCFLAGS -fpermissive" \ diff --git a/libraries/ffms2/ffms2.info b/libraries/ffms2/ffms2.info index 307147c833..a331fadc45 100644 --- a/libraries/ffms2/ffms2.info +++ b/libraries/ffms2/ffms2.info @@ -1,8 +1,8 @@ PRGNAM="ffms2" -VERSION="2.40" +VERSION="5.0" HOMEPAGE="https://github.com/FFMS/ffms2" -DOWNLOAD="https://github.com/FFMS/ffms2/archive/2.40/ffms2-2.40.tar.gz" -MD5SUM="141f194432d70bbf5456a847043f332a" +DOWNLOAD="https://github.com/FFMS/ffms2/archive/5.0/ffms2-5.0.tar.gz" +MD5SUM="c90259950777de3c429a78038a6a00a3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/flickcurl/flickcurl.SlackBuild b/libraries/flickcurl/flickcurl.SlackBuild index 4e2172fcb3..e2ebbedd96 100644 --- a/libraries/flickcurl/flickcurl.SlackBuild +++ b/libraries/flickcurl/flickcurl.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=flickcurl VERSION=${VERSION:-1.26} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,6 +73,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +patch -p0 < $CWD/includes.patch 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/libraries/flickcurl/includes.patch b/libraries/flickcurl/includes.patch new file mode 100644 index 0000000000..9acc0642d3 --- /dev/null +++ b/libraries/flickcurl/includes.patch @@ -0,0 +1,275 @@ +diff -ur src.old/activity.c src/activity.c +--- src.old/activity.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/activity.c 2024-10-13 11:44:49.745270696 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/args.c src/args.c +--- src.old/args.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/args.c 2024-10-13 11:48:38.331145970 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/blog.c src/blog.c +--- src.old/blog.c 2024-10-13 11:43:00.000881158 +0900 ++++ src/blog.c 2024-10-13 11:43:54.910577158 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/category.c src/category.c +--- src.old/category.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/category.c 2024-10-13 11:43:24.710194543 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/collection.c src/collection.c +--- src.old/collection.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/collection.c 2024-10-13 11:43:15.118072925 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/comments.c src/comments.c +--- src.old/comments.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/comments.c 2024-10-13 11:44:31.003033817 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/contacts.c src/contacts.c +--- src.old/contacts.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/contacts.c 2024-10-13 11:45:19.570647295 +0900 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/context.c src/context.c +--- src.old/context.c 2024-10-13 11:43:00.000881158 +0900 ++++ src/context.c 2024-10-13 11:49:15.717613873 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/exif.c src/exif.c +--- src.old/exif.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/exif.c 2024-10-13 11:49:04.788477160 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/gallery.c src/gallery.c +--- src.old/gallery.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/gallery.c 2024-10-13 11:48:54.363346699 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/group.c src/group.c +--- src.old/group.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/group.c 2024-10-13 11:49:30.564799510 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/legacy-auth.c src/legacy-auth.c +--- src.old/legacy-auth.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/legacy-auth.c 2024-10-13 11:56:39.293976791 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/members.c src/members.c +--- src.old/members.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/members.c 2024-10-13 11:54:35.846594448 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/method.c src/method.c +--- src.old/method.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/method.c 2024-10-13 11:54:39.492639524 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/note.c src/note.c +--- src.old/note.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/note.c 2024-10-13 11:54:32.676555252 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/oauth.c src/oauth.c +--- src.old/oauth.c 2024-10-13 11:43:00.000881158 +0900 ++++ src/oauth.c 2024-10-13 11:56:34.588936076 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/perms.c src/perms.c +--- src.old/perms.c 2024-10-13 11:43:00.000881158 +0900 ++++ src/perms.c 2024-10-13 11:55:31.035276137 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/photo.c src/photo.c +--- src.old/photo.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/photo.c 2024-10-13 11:54:25.302464059 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + + #ifdef HAVE_CONFIG_H +diff -ur src.old/photoset.c src/photoset.c +--- src.old/photoset.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/photoset.c 2024-10-13 11:54:28.555504292 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/sha1.c src/sha1.c +--- src.old/sha1.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/sha1.c 2024-10-13 11:56:51.346081132 +0900 +@@ -92,6 +92,7 @@ + #include + #include + #include ++#include + + #include + #include +diff -ur src.old/size.c src/size.c +--- src.old/size.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/size.c 2024-10-13 11:54:16.726357972 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/stat.c src/stat.c +--- src.old/stat.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/stat.c 2024-10-13 11:54:09.052263016 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/tags.c src/tags.c +--- src.old/tags.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/tags.c 2024-10-13 11:53:55.022089347 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/ticket.c src/ticket.c +--- src.old/ticket.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/ticket.c 2024-10-13 11:54:13.112313256 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/user_upload_status.c src/user_upload_status.c +--- src.old/user_upload_status.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/user_upload_status.c 2024-10-13 11:54:04.058201207 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include diff --git a/libraries/fmt/README b/libraries/fmt/README deleted file mode 100644 index aac25b6316..0000000000 --- a/libraries/fmt/README +++ /dev/null @@ -1,2 +0,0 @@ -{fmt} is an open-source formatting library for C++. It can be used as a -safe and fast alternative to (s)printf and iostreams. diff --git a/libraries/fmt/fmt.SlackBuild b/libraries/fmt/fmt.SlackBuild deleted file mode 100644 index bc2a0b642c..0000000000 --- a/libraries/fmt/fmt.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -# Slackware build script for fmt - -# Copyright 2022-2024 Steven Voges -# Copyright 2019-2021 Hunter Sezen California, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fmt -VERSION=${VERSION:-10.2.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_SKIP_RPATH=TRUE \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | - grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.md LICENSE \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/fmt/fmt.info b/libraries/fmt/fmt.info deleted file mode 100644 index 6942c4a773..0000000000 --- a/libraries/fmt/fmt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fmt" -VERSION="10.2.1" -HOMEPAGE="https://fmt.dev" -DOWNLOAD="https://github.com/fmtlib/fmt/archive/10.2.1/fmt-10.2.1.tar.gz" -MD5SUM="dc09168c94f90ea890257995f2c497a5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/fmt/slack-desc b/libraries/fmt/slack-desc deleted file mode 100644 index 01b96bb24d..0000000000 --- a/libraries/fmt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fmt: fmt (A modern formatting library) -fmt: -fmt: {fmt} is an open-source formatting library for C++. It can be used as -fmt: a safe and fast alternative to (s)printf and iostreams. -fmt: -fmt: Homepage: https://fmt.dev/ -fmt: -fmt: -fmt: -fmt: -fmt: diff --git a/libraries/ftgl/ftgl.SlackBuild b/libraries/ftgl/ftgl.SlackBuild index ce85294cb6..090ffdca23 100644 --- a/libraries/ftgl/ftgl.SlackBuild +++ b/libraries/ftgl/ftgl.SlackBuild @@ -84,7 +84,7 @@ DOCOPT="--disable-doc" [ "${DOCS:-no}" = "yes" ] && DOCOPT="--enable-doc" CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=gnu++11" \ +CXXFLAGS="$SLKCFLAGS -std=gnu++11 -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/gdl/gdl.SlackBuild b/libraries/gdl/gdl.SlackBuild index f59ee628ae..707ad87ecd 100644 --- a/libraries/gdl/gdl.SlackBuild +++ b/libraries/gdl/gdl.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gdl -VERSION=${VERSION:-3.34.0} -BUILD=${BUILD:-3} +VERSION=${VERSION:-3.40.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -83,7 +80,7 @@ find -L . \ # Don't create the __pycache__ directory. export PYTHONDONTWRITEBYTECODE=1 -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/gdl/gdl.info b/libraries/gdl/gdl.info index cadf2359c3..2b7af28d80 100644 --- a/libraries/gdl/gdl.info +++ b/libraries/gdl/gdl.info @@ -1,8 +1,8 @@ PRGNAM="gdl" -VERSION="3.34.0" +VERSION="3.40.0" HOMEPAGE="https://www.gnome.org/" -DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/gdl/3.34/gdl-3.34.0.tar.xz" -MD5SUM="d624f2ca85555402828d5c4a98912b82" +DOWNLOAD="https://download.gnome.org/sources/gdl/3.40/gdl-3.40.0.tar.xz" +MD5SUM="21df1254b49b74a498feb99be57364d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/gevent/gevent.SlackBuild b/libraries/gevent/gevent.SlackBuild index 27094767a1..5dc78499ed 100644 --- a/libraries/gevent/gevent.SlackBuild +++ b/libraries/gevent/gevent.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 {} \; +# https://github.com/gevent/gevent/issues/2031 +patch -p1 < $CWD/workaround-cython-bug.patch + python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/libraries/gevent/workaround-cython-bug.patch b/libraries/gevent/workaround-cython-bug.patch new file mode 100644 index 0000000000..3f90f65e72 --- /dev/null +++ b/libraries/gevent/workaround-cython-bug.patch @@ -0,0 +1,9 @@ +--- a/src/gevent/_gevent_cqueue.pxd ++++ b/src/gevent/_gevent_cqueue.pxd +@@ -75,7 +75,6 @@ cdef class ItemWaiter(Waiter): + cdef readonly Queue queue + + +-@cython.final + cdef class UnboundQueue(Queue): + pass diff --git a/libraries/gflags/gflags.SlackBuild b/libraries/gflags/gflags.SlackBuild index 470ed8b0de..fd7373ae1d 100644 --- a/libraries/gflags/gflags.SlackBuild +++ b/libraries/gflags/gflags.SlackBuild @@ -85,6 +85,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DGFLAGS_LIBRARY_INSTALL_DIR="lib${LIBDIRSUFFIX}" \ -DGFLAGS_BUILD_SHARED_LIBS:BOOL=ON \ -DREGISTER_BUILD_DIR:BOOL=OFF \ diff --git a/libraries/gl2ps/gl2ps.SlackBuild b/libraries/gl2ps/gl2ps.SlackBuild index b8c7b99788..3a1016e3b7 100644 --- a/libraries/gl2ps/gl2ps.SlackBuild +++ b/libraries/gl2ps/gl2ps.SlackBuild @@ -88,6 +88,7 @@ cd build -DCMAKE_EXE_LINKER_FLAGS:STRING="-lm" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/libraries/gspell/README b/libraries/gspell/README deleted file mode 100644 index f36221777b..0000000000 --- a/libraries/gspell/README +++ /dev/null @@ -1,4 +0,0 @@ -gspell (spell checking library for GTK+ applications) - -gspell provides a flexible API to add spell-checking to a GTK+ -application. diff --git a/libraries/gspell/gspell.SlackBuild b/libraries/gspell/gspell.SlackBuild deleted file mode 100644 index 5d79f30c6c..0000000000 --- a/libraries/gspell/gspell.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -# Slackware build script for gspell - -# Copyright 2021 Igor Alexandrov -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20220422 bkw: Modified by SlackBuilds.org, BUILD=3: -# - fix PRINT_PACKAGE_NAME (PKGTYPE wasn't set). -# - remove useless ABOUT-NLS and INSTALL from doc dir. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=gspell -VERSION=${VERSION:-1.12.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$(uname -m) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-debug \ - --disable-static \ - --enable-gtk-doc \ - --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 -name '*.la' -delete - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog HACKING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/gspell/gspell.info b/libraries/gspell/gspell.info deleted file mode 100644 index b7765def4a..0000000000 --- a/libraries/gspell/gspell.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gspell" -VERSION="1.12.1" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell" -DOWNLOAD="https://download.gnome.org/sources/gspell/1.12/gspell-1.12.1.tar.xz" -MD5SUM="6c1145a0d2a40c2266337a3975e0e8d5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Igor Alexandrov" -EMAIL="igor.alexandrov@outlook.com" diff --git a/libraries/gspell/slack-desc b/libraries/gspell/slack-desc deleted file mode 100644 index 63b73cefab..0000000000 --- a/libraries/gspell/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -gspell: gspell (spell checking library for GTK+ applications) -gspell: -gspell: gspell provides a flexible API to add spell-checking to -gspell: a GTK+ application. -gspell: -gspell: More details: -gspell: https://gitlab.gnome.org/GNOME/gspell -gspell: -gspell: -gspell: -gspell: diff --git a/libraries/gtk-layer-shell/README b/libraries/gtk-layer-shell/README deleted file mode 100644 index 4f6cf59685..0000000000 --- a/libraries/gtk-layer-shell/README +++ /dev/null @@ -1,21 +0,0 @@ -gtk-layer-shell is a library to write GTK applications that -use Layer Shell. -Layer Shell is a Wayland protocol for desktop shell components, -such as panels, notifications and wallpapers. You can use it to anchor -your windows to a corner or edge of the output, or stretch them across -the entire output. It supports all Layer Shell features including popups -and popovers (GTK popups Just Work™). This Library is compatible with -C, C++ and any language that supports GObject introspection files -(Python, Vala, etc,). - -This library only works on Wayland, and only on Wayland compositors -that support the Layer Shell protcol. Layer shell is supported on: - -•wlroots based compositors (such as Sway) -•Mir-based compositors (some may not enable the protocol by default -and require --add-wayland-extension zwlr_layer_shell_v1) - -Layer shell is not supported on: - -•Gnome-on-Wayland -•Any X11 desktop diff --git a/libraries/gtk-layer-shell/gtk-layer-shell.SlackBuild b/libraries/gtk-layer-shell/gtk-layer-shell.SlackBuild deleted file mode 100644 index 9917f557cd..0000000000 --- a/libraries/gtk-layer-shell/gtk-layer-shell.SlackBuild +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/bash - -# Slackware build script for gtk-layer-shell - -# Copyright 2022 Damian Perticone Berisso, Argentina -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=gtk-layer-shell -VERSION=${VERSION:-0.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dstrip=true \ - -Dexamples=true \ - -Ddocs=true \ - -Dtests=false \ - -Dintrospection=true \ - - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod \ - -o -name ".packlist" \ - -o -name "*.bs" \ - | xargs rm -f - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG.md LICENSE_GPL.txt LICENSE_LGPL.txt LICENSE_MIT.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cp -a $PKG/usr/share/gtk-doc/html/gtk-layer-shell/* $PKG/usr/doc/$PRGNAM-$VERSION -rm -r $PKG/usr/share/gtk-doc/ - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/gtk-layer-shell/gtk-layer-shell.info b/libraries/gtk-layer-shell/gtk-layer-shell.info deleted file mode 100644 index 46f9f1efad..0000000000 --- a/libraries/gtk-layer-shell/gtk-layer-shell.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gtk-layer-shell" -VERSION="0.7.0" -HOMEPAGE="https://github.com/wmww/gtk-layer-shell" -DOWNLOAD="https://github.com/wmww/gtk-layer-shell/archive/refs/tags/v0.7.0/gtk-layer-shell-0.7.0.tar.gz" -MD5SUM="d6edf452c8b2e74f44bd6a1057581356" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Damian Perticone" -EMAIL="mjolnirdam@gmail.com" diff --git a/libraries/gtk-layer-shell/slack-desc b/libraries/gtk-layer-shell/slack-desc deleted file mode 100644 index 8dd31e0cac..0000000000 --- a/libraries/gtk-layer-shell/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gtk-layer-shell: gtk-layer-shell (Layer Shell GTK applications library) -gtk-layer-shell: -gtk-layer-shell: Gtk-layer-shell is a library to write GTK applications that use -gtk-layer-shell: Layer Shell. Layer Shell is a Wayland protocol for desktop shell -gtk-layer-shell: components, such as panels, notifications and wallpapers -gtk-layer-shell: -gtk-layer-shell: -gtk-layer-shell: -gtk-layer-shell: Home: https://github.com/wmww/gtk-layer-shell -gtk-layer-shell: -gtk-layer-shell: diff --git a/libraries/gtksourceview/gtksourceview.SlackBuild b/libraries/gtksourceview/gtksourceview.SlackBuild index 34036e338c..00d06144df 100644 --- a/libraries/gtksourceview/gtksourceview.SlackBuild +++ b/libraries/gtksourceview/gtksourceview.SlackBuild @@ -81,7 +81,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-incompatible-pointer-types" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/gtksourceview4/README b/libraries/gtksourceview3/README similarity index 100% rename from libraries/gtksourceview4/README rename to libraries/gtksourceview3/README diff --git a/libraries/gtksourceview3/d880929f02730e3a2d0e4f8fd69f2831b8ade4d0.patch b/libraries/gtksourceview3/d880929f02730e3a2d0e4f8fd69f2831b8ade4d0.patch new file mode 100644 index 0000000000..a222cea933 --- /dev/null +++ b/libraries/gtksourceview3/d880929f02730e3a2d0e4f8fd69f2831b8ade4d0.patch @@ -0,0 +1,42 @@ +From 8e6c8102d9a9080c31b2ce0731317a2bb946d236 Mon Sep 17 00:00:00 2001 +From: Will Thompson +Date: Mon, 24 Mar 2025 10:22:03 +0000 +Subject: [PATCH] gtksourceview: Add typecast when setting source_buffer +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With the GNOME 48 runtime, build fails with: + + gtksourceview.c: In function ‘set_source_buffer’: + gtksourceview.c:1589:43: error: assignment to ‘GtkSourceBuffer *’ {aka ‘struct _GtkSourceBuffer *’} from incompatible pointer type ‘GtkTextBuffer *’ {aka ‘struct _GtkTextBuffer *’} [-Wincompatible-pointer-types] + 1589 | view->priv->source_buffer = g_object_ref (buffer); + | ^ + +I believe this is due to newer GLib versions preserving type information +in g_object_ref(). This code path is guarded with a GTK_IS_SOURCE_BUFFER +(buffer) check so the assignment is correct. Add a cast. + +(On newer branches, this was fixed in commit +aa3140aa69760b62e4aaea726801951c1cb6b8b5 but that does not apply cleanly +to the gnome-3-24 branch.) +--- + gtksourceview/gtksourceview.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c +index 0c3a007b9..c8be4bfdf 100644 +--- a/gtksourceview/gtksourceview.c ++++ b/gtksourceview/gtksourceview.c +@@ -1586,7 +1586,7 @@ set_source_buffer (GtkSourceView *view, + { + GtkSourceBufferInternal *buffer_internal; + +- view->priv->source_buffer = g_object_ref (buffer); ++ view->priv->source_buffer = g_object_ref (GTK_SOURCE_BUFFER (buffer)); + + g_signal_connect (buffer, + "highlight-updated", +-- +GitLab + diff --git a/libraries/gtksourceview3/gtksourceview3.SlackBuild b/libraries/gtksourceview3/gtksourceview3.SlackBuild new file mode 100644 index 0000000000..03d26ffd7a --- /dev/null +++ b/libraries/gtksourceview3/gtksourceview3.SlackBuild @@ -0,0 +1,110 @@ +#!/bin/bash + +# Copyright 2012-2016 Willy Sudiarto Raharjo +# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2025 Nathaniel Russell +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=gtksourceview3 +SRCNAM=gtksourceview +VERSION=${VERSION:-3.24.11} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z +cd $SRCNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +patch -Np1 -i $CWD/d880929f02730e3a2d0e4f8fd69f2831b8ade4d0.patch + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --enable-glade-catalog \ + --build=$ARCH-slackware-linux +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS 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 diff --git a/libraries/gtksourceview3/gtksourceview3.info b/libraries/gtksourceview3/gtksourceview3.info new file mode 100644 index 0000000000..69337bf223 --- /dev/null +++ b/libraries/gtksourceview3/gtksourceview3.info @@ -0,0 +1,10 @@ +PRGNAM="gtksourceview3" +VERSION="3.24.11" +HOMEPAGE="http://projects.gnome.org/gtksourceview/" +DOWNLOAD="https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.11.tar.xz" +MD5SUM="b748da426a7d64e1304f0c532b0f2a67" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Nathaniel Russell" +EMAIL="naterussell83@gmail.com" diff --git a/libraries/gtksourceview3/slack-desc b/libraries/gtksourceview3/slack-desc new file mode 100644 index 0000000000..585fe63409 --- /dev/null +++ b/libraries/gtksourceview3/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------------------------------------------------------| +gtksourceview3: gtksourceview3 (a GTK+ framework for source code editing) +gtksourceview3: +gtksourceview3: GtkSourceView is a portable C library that extends the standard +gtksourceview3: GTK+ framework for multiline text editing with support for +gtksourceview3: configurable syntax highlighting, unlimited undo/redo, UTF-8 +gtksourceview3: compliant caseless searching, printing and other features +gtksourceview3: typical of a source code editor. +gtksourceview3: +gtksourceview3: Homepage: https://projects.gnome.org/gtksourceview/ +gtksourceview3: +gtksourceview3: diff --git a/libraries/gtksourceview4/gtksourceview4.SlackBuild b/libraries/gtksourceview4/gtksourceview4.SlackBuild deleted file mode 100644 index fc311fa761..0000000000 --- a/libraries/gtksourceview4/gtksourceview4.SlackBuild +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -# Slackware build script for gtksourceview4 - -# Copyright 2012-2021 Willy Sudiarto Raharjo -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=gtksourceview4 -SRCNAM=gtksourceview -VERSION=${VERSION:-4.8.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dglade_catalog=true - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING* HACKING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/gtksourceview4/gtksourceview4.info b/libraries/gtksourceview4/gtksourceview4.info deleted file mode 100644 index 1f27c600e5..0000000000 --- a/libraries/gtksourceview4/gtksourceview4.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gtksourceview4" -VERSION="4.8.4" -HOMEPAGE="http://projects.gnome.org/gtksourceview/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/4.8/gtksourceview-4.8.4.tar.xz" -MD5SUM="2bf056caaae27654ec3a5930dd5597d3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/gtksourceview4/slack-desc b/libraries/gtksourceview4/slack-desc deleted file mode 100644 index 5ceea4e49e..0000000000 --- a/libraries/gtksourceview4/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gtksourceview4: gtksourceview4 (a GTK+ framework for source code editing) -gtksourceview4: -gtksourceview4: GtkSourceView is a portable C library that extends the standard -gtksourceview4: GTK+ framework for multiline text editing with support for -gtksourceview4: configurable syntax highlighting, unlimited undo/redo, UTF-8 -gtksourceview4: compliant caseless searching, printing and other features -gtksourceview4: typical of a source code editor. -gtksourceview4: -gtksourceview4: Homepage: http://projects.gnome.org/gtksourceview/ -gtksourceview4: -gtksourceview4: diff --git a/libraries/hidapi/hidapi.SlackBuild b/libraries/hidapi/hidapi.SlackBuild index 0635ae68d0..8f00f6d1b0 100644 --- a/libraries/hidapi/hidapi.SlackBuild +++ b/libraries/hidapi/hidapi.SlackBuild @@ -83,6 +83,7 @@ cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/html5lib/README b/libraries/html5lib/README deleted file mode 100644 index 7e57438059..0000000000 --- a/libraries/html5lib/README +++ /dev/null @@ -1,5 +0,0 @@ -html5lib is a pure-python library for parsing HTML. It is designed to -conform to the WHATWG HTML specification, as is implemented by all -major web browsers. - -Optional dependencies: genshi and lxml diff --git a/libraries/html5lib/html5lib.SlackBuild b/libraries/html5lib/html5lib.SlackBuild deleted file mode 100644 index fa754e8b25..0000000000 --- a/libraries/html5lib/html5lib.SlackBuild +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# Slackware build script for html5lib - -# Copyright 2023 Steven Voges -# Copyright 2017-2018 Larry Hajali -# Written by Šime Ramov -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=html5lib -VERSION=${VERSION:-1.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.rst LICENSE PKG-INFO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/html5lib/html5lib.info b/libraries/html5lib/html5lib.info deleted file mode 100644 index 2640ea6836..0000000000 --- a/libraries/html5lib/html5lib.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="html5lib" -VERSION="1.1" -HOMEPAGE="https://github.com/html5lib/html5lib-python" -DOWNLOAD="https://files.pythonhosted.org/packages/ac/b6/b55c3f49042f1df3dcd422b7f224f939892ee94f22abcf503a9b7339eaf2/html5lib-1.1.tar.gz" -MD5SUM="6748742e2ec4cb99287a6bc82bcfe2b0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-webencodings" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/html5lib/slack-desc b/libraries/html5lib/slack-desc deleted file mode 100644 index e4a55d3a1d..0000000000 --- a/libraries/html5lib/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -html5lib: html5lib (HTML parser based on the HTML5 specification) -html5lib: -html5lib: Standards-compliant library for parsing and serializing HTML documents -html5lib: and fragments in Python -html5lib: -html5lib: Homepage: https://github.com/html5lib/html5lib-python -html5lib: -html5lib: -html5lib: -html5lib: -html5lib: diff --git a/libraries/iniparser/README b/libraries/iniparser/README deleted file mode 100644 index f9cd696418..0000000000 --- a/libraries/iniparser/README +++ /dev/null @@ -1,6 +0,0 @@ -Iniparser is a free stand-alone INI file parsing library. -It is written in portable ANSI C and should compile anywhere. - -WARNING: -This package will overwrite Samba's libiniparser.so -If you remove this package, don't forget to reinstall samba diff --git a/libraries/iniparser/iniparser.SlackBuild b/libraries/iniparser/iniparser.SlackBuild deleted file mode 100644 index 83ffb96692..0000000000 --- a/libraries/iniparser/iniparser.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -# Slackware build script for Iniparser - -# Copyright 2017, Steven King -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20220418 bkw: Modified by SlackBuilds.org, BUILD=2: -# - actually use SLKCFLAGS. -# - remove the static library. -# - fix the shared library so it actually works. -# - install the shared lib stripped. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=iniparser -VERSION=${VERSION:-4.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 vxf $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 {} \+ - -# 20220418 bkw: previous version of this script tried to fix the -rpath -# info in the shared library, but was broken. this works: -sed -i "s,/usr/lib,/usr/lib$LIBDIRSUFFIX," Makefile - -# 20220418 bkw: SLKCFLAGS weren't being used. -CFLAGS="$SLKCFLAGS" \ -CXFLAGS="$SLKCFLAGS" \ -make V=1 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} -mkdir -p $PKG/usr/include - -cp -ar AUTHORS LICENSE README.md html $PKG/usr/doc/$PRGNAM-$VERSION - -install -s -m0755 libiniparser.so.0 $PKG/usr/lib${LIBDIRSUFFIX} - -# 20220418 bkw: create the symlink gcc uses to link with this. -# previously, anything (such as cava) which linked with -# -liniparser was actually using the static library. -ln -s lib${PRGNAM}.so.0 $PKG/usr/lib$LIBDIRSUFFIX/lib${PRGNAM}.so - -cp -a ./src/dictionary.h ./src/iniparser.h $PKG/usr/include - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/iniparser/iniparser.info b/libraries/iniparser/iniparser.info deleted file mode 100644 index de282c9c58..0000000000 --- a/libraries/iniparser/iniparser.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="iniparser" -VERSION="4.0" -HOMEPAGE="https://github.com/ndevilla/iniparser" -DOWNLOAD="https://github.com/ndevilla/iniparser/archive/v4.0/iniparser-4.0.tar.gz" -MD5SUM="94c7278f8d22de1a31320219b27634b0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven King" -EMAIL="kingrst@gmail.com" diff --git a/libraries/iniparser/slack-desc b/libraries/iniparser/slack-desc deleted file mode 100644 index c410aaa786..0000000000 --- a/libraries/iniparser/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -iniparser: iniparser (A free stand-alone INI file parsing library) -iniparser: -iniparser: It is written in portable ANSI C and should compile anywhere. -iniparser: Iniparser is distributed under an MIT license. -iniparser: -iniparser: Homepage: http://ndevilla.free.fr/iniparser -iniparser: -iniparser: -iniparser: -iniparser: -iniparser: diff --git a/libraries/keybinder/keybinder.SlackBuild b/libraries/keybinder/keybinder.SlackBuild index a0c586771d..4f4c77de0e 100644 --- a/libraries/keybinder/keybinder.SlackBuild +++ b/libraries/keybinder/keybinder.SlackBuild @@ -91,6 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --disable-python \ + --disable-lua \ --build=$ARCH-slackware-linux make diff --git a/libraries/kirigami-addons/README b/libraries/kirigami-addons/README deleted file mode 100644 index 117ddbb50f..0000000000 --- a/libraries/kirigami-addons/README +++ /dev/null @@ -1,9 +0,0 @@ -kirigami-addons (Add-ons for the Kirigami framework) - -A set of "widgets" i.e visual end user components along with a code -to support them. Components are usable by both touch and desktop -experiences providing a native experience on both, and look native -with any QQC2 style (qqc2-desktop-theme, Material or Plasma). - -NOTE: This is the latest supported version for Slackware 15.0 unless -Plasma Framework is updated to 5.91 or higher. diff --git a/libraries/kirigami-addons/kirigami-addons.SlackBuild b/libraries/kirigami-addons/kirigami-addons.SlackBuild deleted file mode 100644 index 3baaad845f..0000000000 --- a/libraries/kirigami-addons/kirigami-addons.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash - -# Slackware build script for kirigami-addons - -# Copyright 2023 Jeremy Hansen -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=kirigami-addons -VERSION=${VERSION:-0.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/kirigami-addons/kirigami-addons.info b/libraries/kirigami-addons/kirigami-addons.info deleted file mode 100644 index 49fdcc1d7b..0000000000 --- a/libraries/kirigami-addons/kirigami-addons.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kirigami-addons" -VERSION="0.2" -HOMEPAGE="https://invent.kde.org/libraries/kirigami-addons" -DOWNLOAD="https://github.com/KDE/kirigami-addons/archive/refs/tags/v0.2/kirigami-addons-0.2.tar.gz" -MD5SUM="aec5730a5cfe061912b8b302bbf33b03" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/libraries/kirigami-addons/slack-desc b/libraries/kirigami-addons/slack-desc deleted file mode 100644 index a556548d72..0000000000 --- a/libraries/kirigami-addons/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -kirigami-addons: kirigami-addons (Add-ons for the Kirigami framework) -kirigami-addons: -kirigami-addons: A set of "widgets" i.e visual end user components along with a code -kirigami-addons: to support them. Components are usable by both touch and desktop -kirigami-addons: experiences providing a native experience on both, and look native -kirigami-addons: with any QQC2 style (qqc2-desktop-theme, Material or Plasma). -kirigami-addons: -kirigami-addons: HOMEPAGE: https://invent.kde.org/libraries/kirigami-addons -kirigami-addons: -kirigami-addons: -kirigami-addons: diff --git a/libraries/lgi/README b/libraries/lgi/README deleted file mode 100644 index de6bd889f8..0000000000 --- a/libraries/lgi/README +++ /dev/null @@ -1,3 +0,0 @@ -lgi is gobject-introspection based dynamic Lua binding to GObject -based libraries. -It allows using GObject-based libraries directly from Lua. diff --git a/libraries/lgi/lgi.SlackBuild b/libraries/lgi/lgi.SlackBuild deleted file mode 100644 index 47f5c5e5c5..0000000000 --- a/libraries/lgi/lgi.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -# Slackware build script for lgi - -# Copyright 2013-2018 Heiko Rosemann 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. - -# Modified by the SlackBuilds.org project - -# 20241018 bkw: BUILD=2, build with lua51. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=lgi -VERSION=${VERSION:-0.9.2} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -sed -i 's,-llua,-llua5.1,' lgi/Makefile - -# Fix this stuff with sed -sed -i \ - -e "s|/usr/local|/usr|" \ - -e "s|/lib/lua/|/lib$LIBDIRSUFFIX/lua/|" \ - lgi/Makefile - -make PREFIX=/usr CFLAGS="$SLKCFLAGS" LUA_CFLAGS="-I/usr/include/lua5.1" -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/* LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/lgi/lgi.info b/libraries/lgi/lgi.info deleted file mode 100644 index d1c7eb3bbb..0000000000 --- a/libraries/lgi/lgi.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="lgi" -VERSION="0.9.2" -HOMEPAGE="https://github.com/pavouk/lgi/" -DOWNLOAD="https://github.com/pavouk/lgi/archive/0.9.2/lgi-0.9.2.tar.gz" -MD5SUM="ad5d2e7a4427069f926f2ca472a5fe6d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="lua51" -MAINTAINER="Heiko Rosemann" -EMAIL="heiko.rosemann@web.de" diff --git a/libraries/lgi/slack-desc b/libraries/lgi/slack-desc deleted file mode 100644 index a407064a1c..0000000000 --- a/libraries/lgi/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -lgi: lgi (LUA GObject bindings) -lgi: -lgi: lgi is gobject-introspection based dynamic Lua binding to GObject -lgi: based libraries. -lgi: It allows using GObject-based libraries directly from Lua. -lgi: -lgi: homepage: https://github.com/pavouk/lgi -lgi: -lgi: -lgi: -lgi: diff --git a/libraries/libadwaita/README b/libraries/libadwaita/README index 82c462be4e..8627d67671 100644 --- a/libraries/libadwaita/README +++ b/libraries/libadwaita/README @@ -6,26 +6,6 @@ GTK4 as well as the "Adwaita" theme, a coloring API, and a mechanism to make apps linked against it fit in with a system-wide dark mode preference. -NOTE: -This version of libadwaita for Slackware 15.0 has been patched to -support GTK 4.4. libadwaita upstream advertises its minimum version as -4.6, although it does not use any C API that is not provided by version -4.4. However, according to the libadwaita git logs, it libadwaita relies -on some fixes from GTK 4.6+ to work 100% correctly. I have found -libadwaita to work perfectly reasonably with GTK 4.4. Adding one patch -to suppress a CSS runtime warning, the only issue I have run into is -that some fonts may render as larger than the developers have intended, -and window widths and heights are slightly larger as well. - -As well, starting with libadwaita 1.2, more GObject properties are -starting to get used that only exist on GTK >= 4.6. I have patched out -one such usage that I have observed. However, continuing to patch -libadwaita will not be maintainable in the long run. For that reason, -libadwaita 1.2.x will be the end of the line for Slackware 15.0. - -If you wish to use libadwaita as fully intended by the developers, you -can build a local copy of GTK 4 >= 4.6 on your system. - Build options: BUILDTYPE => customize build type by setting to a value recognized by diff --git a/libraries/libadwaita/libadwaita-1.0.5-support-gtk-4.4.patch b/libraries/libadwaita/libadwaita-1.0.5-support-gtk-4.4.patch deleted file mode 100644 index e85ed58ca0..0000000000 --- a/libraries/libadwaita/libadwaita-1.0.5-support-gtk-4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libadwaita-1.0.5/src/meson.build libadwaita-1.0.5.new/src/meson.build ---- libadwaita-1.0.5/src/meson.build 2022-06-01 06:48:47.000000000 -0400 -+++ libadwaita-1.0.5.new/src/meson.build 2022-06-13 22:37:56.670269324 -0400 -@@ -222,7 +222,7 @@ - ] - - glib_min_version = '>= 2.66' --gtk_min_version = '>= 4.5.0' -+gtk_min_version = '>= 4.4.0' - - gio_dep = dependency('gio-2.0', version: glib_min_version) - gtk_dep = dependency('gtk4', version: gtk_min_version) diff --git a/libraries/libadwaita/libadwaita-1.0.5-suppress-line-break-warnings.patch b/libraries/libadwaita/libadwaita-1.0.5-suppress-line-break-warnings.patch deleted file mode 100644 index c68e9cfb53..0000000000 --- a/libraries/libadwaita/libadwaita-1.0.5-suppress-line-break-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/stylesheet/widgets/_trees.scss b/src/stylesheet/widgets/_trees.scss -index 8b137968..a067bd4a 100644 ---- a/src/stylesheet/widgets/_trees.scss -+++ b/src/stylesheet/widgets/_trees.scss -@@ -73,7 +73,6 @@ treeview.view { - padding-bottom: 3px; - border-radius: 0; - box-shadow: none; -- line-height: 100%; - - > box { - color: gtkalpha(currentColor, if($contrast == 'high', .6, .4)); diff --git a/libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch b/libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch deleted file mode 100644 index 4b1f004b9a..0000000000 --- a/libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur libadwaita-1.2.0/src/adw-message-dialog.ui libadwaita-1.2.0.new/src/adw-message-dialog.ui ---- libadwaita-1.2.0/src/adw-message-dialog.ui 2022-09-14 20:41:34.000000000 -0400 -+++ libadwaita-1.2.0.new/src/adw-message-dialog.ui 2023-01-25 18:00:34.228428374 -0500 -@@ -5,11 +5,6 @@ - -- -- -- False -- -- - - - diff --git a/libraries/libadwaita/libadwaita.SlackBuild b/libraries/libadwaita/libadwaita.SlackBuild index 92e6e5de08..2638fada3a 100644 --- a/libraries/libadwaita/libadwaita.SlackBuild +++ b/libraries/libadwaita/libadwaita.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libadwaita -# Copyright © 2022-2023 Logan Rathbone, Province of Ontario, Canada +# Copyright © 2022-2025 Logan Rathbone, Province of Ontario, Canada # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libadwaita -VERSION=${VERSION:-1.2.5} +VERSION=${VERSION:-1.7.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,10 +71,6 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -patch -p1 < $CWD/libadwaita-1.0.5-support-gtk-4.4.patch -patch -p1 < $CWD/libadwaita-1.0.5-suppress-line-break-warnings.patch -patch -p1 < $CWD/libadwaita-1.2.0-dont-use-titlebar-property.patch - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -84,7 +80,8 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -meson \ +meson setup \ + --wrap-mode=nodownload \ --buildtype=${BUILDTYPE:-release} \ --infodir=/usr/info \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -108,7 +105,7 @@ fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS HACKING* README* COPYING NEWS \ + AUTHORS CONTRIBUTING* COPYING NEWS README* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/libadwaita/libadwaita.info b/libraries/libadwaita/libadwaita.info index e68d3b3ef3..40dd21c9b9 100644 --- a/libraries/libadwaita/libadwaita.info +++ b/libraries/libadwaita/libadwaita.info @@ -1,10 +1,10 @@ PRGNAM="libadwaita" -VERSION="1.2.5" +VERSION="1.7.4" HOMEPAGE="https://gitlab.gnome.org/GNOME/libadwaita" -DOWNLOAD="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/1.2.5/libadwaita-1.2.5.tar.gz" -MD5SUM="2036469b45424f2592248b628e3fccec" +DOWNLOAD="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/1.7.4/libadwaita-1.7.4.tar.gz" +MD5SUM="96436dede62dc570435bcc022e23ec86" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="AppStream" MAINTAINER="Logan Rathbone" EMAIL="poprocks@gmail.com" diff --git a/libraries/libass/README b/libraries/libass/README deleted file mode 100644 index b6a6558e40..0000000000 --- a/libraries/libass/README +++ /dev/null @@ -1,5 +0,0 @@ -libass is a portable subtitle renderer for the ASS/SSA (Advanced -Substation Alpha/Substation Alpha) subtitle format. It is mostly -compatible with VSFilter. - -enca and libunibreak are optional dependencies. diff --git a/libraries/libass/libass.SlackBuild b/libraries/libass/libass.SlackBuild deleted file mode 100644 index 10f64bd7da..0000000000 --- a/libraries/libass/libass.SlackBuild +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# Slackware build script for libass - -# Written by Larry Hajali -# Copyright 2011-2023 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libass -VERSION=${VERSION:-0.17.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-static=no \ - --disable-silent-rules \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changelog COPYING $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libass/libass.info b/libraries/libass/libass.info deleted file mode 100644 index 34d42d17e8..0000000000 --- a/libraries/libass/libass.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libass" -VERSION="0.17.1" -HOMEPAGE="https://github.com/libass/libass" -DOWNLOAD="https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz" -MD5SUM="73f00a898161be424e05d4bee1962dbb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libass/slack-desc b/libraries/libass/slack-desc deleted file mode 100644 index d64a3d90f2..0000000000 --- a/libraries/libass/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libass: libass (Subtitle renderer for the ASS/SSA) -libass: -libass: libass is a portable subtitle renderer for the ASS/SSA (Advanced -libass: Substation Alpha/Substation Alpha) subtitle format. It is mostly -libass: compatible with VSFilter. -libass: -libass: Homepage: http://code.google.com/p/libass/ -libass: -libass: -libass: -libass: diff --git a/libraries/libbonobo/libbonobo-2.32.1-c23.patch b/libraries/libbonobo/libbonobo-2.32.1-c23.patch new file mode 100644 index 0000000000..47326482e3 --- /dev/null +++ b/libraries/libbonobo/libbonobo-2.32.1-c23.patch @@ -0,0 +1,37 @@ +diff --git a/bonobo-activation/bonobo-activation-base-service.c b/bonobo-activation/bonobo-activation-base-service.c +index d274378..609b565 100644 +--- a/bonobo-activation/bonobo-activation-base-service.c ++++ b/bonobo-activation/bonobo-activation-base-service.c +@@ -160,21 +160,24 @@ bonobo_activation_registration_iterate (const BonoboActivationBaseService *base_ + + for (link = registries; link; link = link->next) { + RegistryInfo *ri; +- void (*func_ptr) (); ++ void (*func_ptr_2arg) (const BonoboActivationBaseServiceRegistry *, gpointer); ++ void (*func_ptr_4arg) ( ++ const BonoboActivationBaseServiceRegistry *, const char *, ++ const BonoboActivationBaseService *, gpointer ++ ); + + ri = link->data; + +- func_ptr = *(gpointer *) ((guchar *) ri->registry + offset); +- +- if (!func_ptr) +- continue; +- + switch (nargs) { + case 4: +- func_ptr (ri->registry, ior, base_service, ri->user_data); ++ func_ptr_4arg = *(gpointer *) ((guchar *) ri->registry + offset); ++ if (!func_ptr_4arg) continue; ++ func_ptr_4arg (ri->registry, ior, base_service, ri->user_data); + break; + case 2: +- func_ptr (ri->registry, ri->user_data); ++ func_ptr_2arg = *(gpointer *) ((guchar *) ri->registry + offset); ++ if (!func_ptr_2arg) continue; ++ func_ptr_2arg (ri->registry, ri->user_data); + break; + } + } diff --git a/libraries/libbonobo/libbonobo.SlackBuild b/libraries/libbonobo/libbonobo.SlackBuild index 4f68eb8639..41eb7f29ad 100644 --- a/libraries/libbonobo/libbonobo.SlackBuild +++ b/libraries/libbonobo/libbonobo.SlackBuild @@ -83,6 +83,9 @@ find -L . \ patch -p1 < $CWD/remove_use_of_G_DISABLE_DEPRECATED.patch patch -p1 < $CWD/test_no_srcdir.patch +# Fix Building with gcc >= 15.x +patch -p1 < $CWD/libbonobo-2.32.1-c23.patch + autoreconf -fi CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libcbor/libcbor.SlackBuild b/libraries/libcbor/libcbor.SlackBuild index 61f17f46a9..1a2f759d94 100644 --- a/libraries/libcbor/libcbor.SlackBuild +++ b/libraries/libcbor/libcbor.SlackBuild @@ -88,6 +88,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCBOR_CUSTOM_ALLOC=ON .. make VERBOSE=1 make install DESTDIR=$PKG diff --git a/libraries/libccd/libccd.SlackBuild b/libraries/libccd/libccd.SlackBuild index e4bc303c93..91136a38a4 100644 --- a/libraries/libccd/libccd.SlackBuild +++ b/libraries/libccd/libccd.SlackBuild @@ -89,6 +89,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_DATAROOTDIR=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/libcryptui/libcryptui.SlackBuild b/libraries/libcryptui/libcryptui.SlackBuild index a09faec62b..3be093b102 100644 --- a/libraries/libcryptui/libcryptui.SlackBuild +++ b/libraries/libcryptui/libcryptui.SlackBuild @@ -83,6 +83,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# https://reviews.freebsd.org/R11:6a0795e +sed -i 's|"1.2 1.4 2.0"|"1.2 1.4 2.0 2.1 2.2 2.3 2.4"|g' configure + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libcuefile/libcuefile.SlackBuild b/libraries/libcuefile/libcuefile.SlackBuild index eded3fa9d8..6506202b61 100644 --- a/libraries/libcuefile/libcuefile.SlackBuild +++ b/libraries/libcuefile/libcuefile.SlackBuild @@ -65,10 +65,11 @@ echo 'INSTALL(FILES ${libcuefile_SOURCE_DIR}/include/cuetools/cuefile.h ${libcue cmake \ -G "Unix Makefiles" \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -fpermissive" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DLIB_SUFFIX=${LIBDIRSUFFIX} . make diff --git a/libraries/libdart/libdart.SlackBuild b/libraries/libdart/libdart.SlackBuild index eaa3d937d4..9b3fb2bd09 100644 --- a/libraries/libdart/libdart.SlackBuild +++ b/libraries/libdart/libdart.SlackBuild @@ -91,6 +91,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/libdispatch/libdispatch.SlackBuild b/libraries/libdispatch/libdispatch.SlackBuild index a856400a2b..a23f419f99 100644 --- a/libraries/libdispatch/libdispatch.SlackBuild +++ b/libraries/libdispatch/libdispatch.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libdispatch -VERSION=${VERSION:-5.3} +VERSION=${VERSION:-5.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libdispatch/libdispatch.info b/libraries/libdispatch/libdispatch.info index 093ad12ad4..ef5494940b 100644 --- a/libraries/libdispatch/libdispatch.info +++ b/libraries/libdispatch/libdispatch.info @@ -1,8 +1,8 @@ PRGNAM="libdispatch" -VERSION="5.3" +VERSION="5.5" HOMEPAGE="https://apple.github.io/swift-corelibs-libdispatch/" -DOWNLOAD="https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-RELEASE/swift-corelibs-libdispatch-swift-5.3-RELEASE.tar.gz" -MD5SUM="6ab94f19f3b29fe1970fd8471109f184" +DOWNLOAD="https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.5-RELEASE/swift-corelibs-libdispatch-swift-5.5-RELEASE.tar.gz" +MD5SUM="865c9d5225e29cbeebb903faa5e29a2c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libdisplay-info/README b/libraries/libdisplay-info/README deleted file mode 100644 index 44dbcbd8ae..0000000000 --- a/libraries/libdisplay-info/README +++ /dev/null @@ -1,7 +0,0 @@ -EDID and DisplayID library. -Goals: - -Provide a set of high-level, easy-to-use, opinionated functions -as well as low-level functions to access detailed information. -Simplicity and correctness over performance and resource usage. -Well-tested and fuzzed. diff --git a/libraries/libdisplay-info/libdisplay-info.SlackBuild b/libraries/libdisplay-info/libdisplay-info.SlackBuild deleted file mode 100644 index ca0192e2bc..0000000000 --- a/libraries/libdisplay-info/libdisplay-info.SlackBuild +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash - -# Slackware build script for libdisplay-info - -# Copyright 2023 Damian Perticone, Berisso, Argentina -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libdisplay-info -VERSION=${VERSION:-0.1.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dstrip=true \ - - - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install - -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod \ - -o -name ".packlist" \ - -o -name "*.bs" \ - | xargs rm -f - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libdisplay-info/libdisplay-info.info b/libraries/libdisplay-info/libdisplay-info.info deleted file mode 100644 index 242255d927..0000000000 --- a/libraries/libdisplay-info/libdisplay-info.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libdisplay-info" -VERSION="0.1.1" -HOMEPAGE="https://gitlab.freedesktop.org/emersion/libdisplay-info" -DOWNLOAD="https://gitlab.freedesktop.org/emersion/libdisplay-info/-/archive/0.1.1/libdisplay-info-0.1.1.tar.gz" -MD5SUM="f214fc05b8294ef26aec00a66e20f3d8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Damian Perticone" -EMAIL="mjolnirdam@gmail.com" diff --git a/libraries/libdisplay-info/slack-desc b/libraries/libdisplay-info/slack-desc deleted file mode 100644 index 2c28ede803..0000000000 --- a/libraries/libdisplay-info/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libdisplay-info: libdisplay-info (EDID and DisplayID library) -libdisplay-info: -libdisplay-info: Libdisplay-info is a extended display identification data library and -libdisplay-info: displayID library -libdisplay-info: -libdisplay-info: -libdisplay-info: -libdisplay-info: -libdisplay-info: Home: https://gitlab.freedesktop.org/emersion/libdisplay-info -libdisplay-info: -libdisplay-info: diff --git a/libraries/libev/README b/libraries/libev/README deleted file mode 100644 index f7826e9dd5..0000000000 --- a/libraries/libev/README +++ /dev/null @@ -1,12 +0,0 @@ -libev (a high-performance event loop/model) - -Libev is modelled (very loosely) after libevent and the Event perl -module, but is faster, scales better and is more correct, and also -more featureful. And also smaller. Yay. - -Note: libev and libevent both have a usr/include/event.h -header file. This could have lead to compile problems if both -packages were installed at the same time, so it has been moved to -usr/include/libev/event.h. Add CPPFLAGS="-I/usr/include/libev" to -the SlackBuild if the software you're building over this needs the -libevent compatibility layer (lighttpd2 and i3 don't). diff --git a/libraries/libev/libev.SlackBuild b/libraries/libev/libev.SlackBuild deleted file mode 100644 index 0baf104e88..0000000000 --- a/libraries/libev/libev.SlackBuild +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -# Slackware build script for libev - -# Written by Šime Ramov -# Maintained (2012-2020) by Matteo Bernardini , Pisa, Italy - -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libev -VERSION=${VERSION:-4.33} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 {} \; - -# Force CFLAGS -sed -i "s|-g -O3|$SLKCFLAGS|" configure || exit 1 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -# avoid conflicting with libevent, we move an header in a subfolder -# and we will explicitly add CPPFLAGS="-I/usr/include/libev" when -# building software depending on this, if needed: lighttpd2 and i3, -# for example, don't need this header. -mkdir -p $PKG/usr/include/libev -mv $PKG/usr/include/event.h $PKG/usr/include/libev/ - -find $PKG -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 LICENSE Changes $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libev/libev.info b/libraries/libev/libev.info deleted file mode 100644 index a603f1c17c..0000000000 --- a/libraries/libev/libev.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libev" -VERSION="4.33" -HOMEPAGE="http://software.schmorp.de/pkg/libev.html" -DOWNLOAD="http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz" -MD5SUM="a3433f23583167081bf4acdd5b01b34f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libev/slack-desc b/libraries/libev/slack-desc deleted file mode 100644 index 67d4ce48e7..0000000000 --- a/libraries/libev/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libev: libev (a high-performance event loop/model) -libev: -libev: Libev is modelled (very loosely) after libevent and the Event perl -libev: module, but is faster, scales better and is more correct, and also -libev: more featureful. And also smaller. Yay. -libev: -libev: Website: -libev: -libev: -libev: -libev: diff --git a/libraries/libffado/libffado.SlackBuild b/libraries/libffado/libffado.SlackBuild index 3b2467b36b..ca97081218 100644 --- a/libraries/libffado/libffado.SlackBuild +++ b/libraries/libffado/libffado.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libffado -VERSION=${VERSION:-2.4.4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.4.9} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,13 +81,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 icon name, so it's coherent with XDG desktop file name -sed -i 's/hi64-apps-ffado/ffado-mixer/g' \ - support/xdg/ffado.org-ffadomixer.desktop - -# fix id, so it's coherent with XDG desktop file name -sed -i 's/ffado.org-ffadomixer.desktop/ffado-mixer.desktop/g' \ - support/xdg/ffado-mixer.appdata.xml +## fix icon name, so it's coherent with XDG desktop file name +#sed -i 's/hi64-apps-ffado/ffado-mixer/g' \ +# support/xdg/ffado.org-ffadomixer.desktop +# +## fix id, so it's coherent with XDG desktop file name +#sed -i 's/ffado.org-ffadomixer.desktop/ffado-mixer.desktop/g' \ +# support/xdg/ffado-mixer.appdata.xml CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=gnu++11 -Wno-deprecated-declarations" \ @@ -107,14 +107,15 @@ scons \ install mkdir -p $PKG/usr/share/{applications,pixmaps} -install -m 0644 support/xdg/ffado.org-ffadomixer.desktop \ - $PKG/usr/share/applications/ffado-mixer.desktop +install -m 0644 support/xdg/org.ffado.FfadoMixer.desktop \ + $PKG/usr/share/applications/org.ffado.FfadoMixer.desktop install -m 0644 support/xdg/hi64-apps-ffado.png \ $PKG/usr/share/pixmaps/ffado-mixer.png find $PKG -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 diff --git a/libraries/libffado/libffado.info b/libraries/libffado/libffado.info index e37e503c0f..9186df4d76 100644 --- a/libraries/libffado/libffado.info +++ b/libraries/libffado/libffado.info @@ -1,8 +1,8 @@ PRGNAM="libffado" -VERSION="2.4.4" +VERSION="2.4.9" HOMEPAGE="http://www.ffado.org/" -DOWNLOAD="http://www.ffado.org/files/libffado-2.4.4.tgz" -MD5SUM="f27970e21a80a1e9ccc1842c4a6a3c62" +DOWNLOAD="http://www.ffado.org/files/libffado-2.4.9.tgz" +MD5SUM="8e20b9d52a42707cc03f91fa5996b027" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libconfig libdbus-c++ libiec61883 libxml++3" diff --git a/libraries/libgdiplus/libgdiplus.SlackBuild b/libraries/libgdiplus/libgdiplus.SlackBuild index cb4ab7f0d4..3dd44381d7 100644 --- a/libraries/libgdiplus/libgdiplus.SlackBuild +++ b/libraries/libgdiplus/libgdiplus.SlackBuild @@ -85,6 +85,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 {} \; +export CMAKE_POLICY_VERSION_MINIMUM=3.5 + ./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libglpng/libglpng.SlackBuild b/libraries/libglpng/libglpng.SlackBuild index 80bd940a77..1a458d45d2 100644 --- a/libraries/libglpng/libglpng.SlackBuild +++ b/libraries/libglpng/libglpng.SlackBuild @@ -82,7 +82,7 @@ find -L . \ patch -p1 < $CWD/libglpng-1.45-extra_cflags.patch patch -p1 < $CWD/libglpng-1.45-libpng15.patch -make EXTRA_CFLAGS="$SLKCFLAGS" +make EXTRA_CFLAGS="$SLKCFLAGS -fpermissive" make install DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG/usr # The Makefile doesn't make this easy :/ diff --git a/libraries/libgme/libgme.SlackBuild b/libraries/libgme/libgme.SlackBuild index dd408df8b9..7dc510d4f3 100644 --- a/libraries/libgme/libgme.SlackBuild +++ b/libraries/libgme/libgme.SlackBuild @@ -87,6 +87,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/libgusb/README b/libraries/libgusb/README deleted file mode 100644 index e919c2ba34..0000000000 --- a/libraries/libgusb/README +++ /dev/null @@ -1,6 +0,0 @@ -GUsb is a GObject wrapper for libusb1 that makes it easy to do -asynchronous control, bulk and interrupt transfers with proper -cancellation and integration into a mainloop. - -This makes it easy to integrate low level USB transfers with your -high-level application or system daemon. diff --git a/libraries/libgusb/libgusb.SlackBuild b/libraries/libgusb/libgusb.SlackBuild deleted file mode 100644 index 519a936acf..0000000000 --- a/libraries/libgusb/libgusb.SlackBuild +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -# Slackware build script for libgusb - -# Copyright 2016-2024 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libgusb -VERSION=${VERSION:-0.4.9} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - meson setup \ - --prefix=/usr \ - --buildtype=release \ - --libdir=lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - -Ddocs=false \ - .. - - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING* MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \; -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libgusb/libgusb.info b/libraries/libgusb/libgusb.info deleted file mode 100644 index 23dba9393a..0000000000 --- a/libraries/libgusb/libgusb.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libgusb" -VERSION="0.4.9" -HOMEPAGE="https://github.com/hughsie/libgusb" -DOWNLOAD="https://github.com/hughsie/libgusb/releases/download/0.4.9/libgusb-0.4.9.tar.xz" -MD5SUM="354a3227334991ea4e924843c144bd82" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/libgusb/slack-desc b/libraries/libgusb/slack-desc deleted file mode 100644 index 1d91d3896d..0000000000 --- a/libraries/libgusb/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libgusb: libgusb (Glib Wrapper) -libgusb: -libgusb: GUsb is a GObject wrapper for libusb1 that makes it easy to do -libgusb: asynchronous control, bulk and interrupt transfers with proper -libgusb: cancellation and integration into a mainloop. -libgusb: -libgusb: This makes it easy to integrate low level USB transfers with your -libgusb: high-level application or system daemon. -libgusb: -libgusb: Project URL: https://github.com/hughsie/libgusb -libgusb: diff --git a/libraries/libhandy/README b/libraries/libhandy/README deleted file mode 100644 index b2c80e4661..0000000000 --- a/libraries/libhandy/README +++ /dev/null @@ -1,4 +0,0 @@ -libhandy (additional UI components for gtk+3) - -The aim of the Handy library is to help with developing UI for mobile -devices using GTK/GNOME. diff --git a/libraries/libhandy/libhandy.SlackBuild b/libraries/libhandy/libhandy.SlackBuild deleted file mode 100644 index ed273f8ad0..0000000000 --- a/libraries/libhandy/libhandy.SlackBuild +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -# Slackware build script for libhandy - -# Written by B. Watson (urchlay@slackware.uk) - -# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -# 20240729 bkw: updated for v1.8.3. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libhandy -VERSION=${VERSION:-1.8.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dgtk_doc=true \ - -Dstrip=true - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING NEWS *.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libhandy/libhandy.info b/libraries/libhandy/libhandy.info deleted file mode 100644 index 1cc6225d79..0000000000 --- a/libraries/libhandy/libhandy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libhandy" -VERSION="1.8.3" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/" -DOWNLOAD="https://download.gnome.org/sources/libhandy/1.8/libhandy-1.8.3.tar.xz" -MD5SUM="af586a91ff6d4093a6e7e283dfab5f7f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gi-docgen" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/libraries/libhandy/slack-desc b/libraries/libhandy/slack-desc deleted file mode 100644 index 303f0b2f7d..0000000000 --- a/libraries/libhandy/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libhandy: libhandy (additional UI components for gtk+3) -libhandy: -libhandy: The aim of the Handy library is to help with developing UI for mobile -libhandy: devices using GTK/GNOME. -libhandy: -libhandy: -libhandy: -libhandy: -libhandy: -libhandy: -libhandy: diff --git a/libraries/libindi/README b/libraries/libindi/README deleted file mode 100644 index c04391240f..0000000000 --- a/libraries/libindi/README +++ /dev/null @@ -1,16 +0,0 @@ -INDI is a distributed control protocol designed to operate -astronomical instrumentation. INDI is small, flexible, easy to parse, -and scalable. It supports common DCS functions such as remote -control, data acquisition, monitoring, and a lot more. - -This script builds the library that KDE KStars and similar programs -can use for image capture in astrophotography, telescope control, etc. - -rtl-sdr is optional to enable Realtek RTL2832 DVB dongle as a SDR -receiver (available on SBo). There may be additional optional -dependencies. - -Supported hardware devices: http://indilib.org/devices/ -You will need libindi-drivers (also on SBo) to fully utilize some -third party hardware. Refer to indi-{libraries,drivers} on SBo for -optional hardware requirements and dependencies. diff --git a/libraries/libindi/doinst.sh b/libraries/libindi/doinst.sh deleted file mode 100644 index 47e1cb12cb..0000000000 --- a/libraries/libindi/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /sbin/udevadm ]; then - /sbin/udevadm control --reload-rules >/dev/null 2>&1 && /sbin/udevadm trigger >/dev/null 2>&1 -fi diff --git a/libraries/libindi/libindi.SlackBuild b/libraries/libindi/libindi.SlackBuild deleted file mode 100644 index dd927245cb..0000000000 --- a/libraries/libindi/libindi.SlackBuild +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -# Slackware build script for libindi - -# Copyright 2018, 2022 Edward W. Koenig, Vancouver, WA, 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libindi -VERSION=${VERSION:-2.0.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -SRCNAM=indi - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -export LDFLAGS="-lbz2" -mkdir -p build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DINCLUDE_INSTALL_DIR=/usr/include \ - -DUDEVRULES_INSTALL_DIR=/lib/udev/rules.d \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING.* INSTALL LICENSE README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libindi/libindi.info b/libraries/libindi/libindi.info deleted file mode 100644 index 3ae80bc03a..0000000000 --- a/libraries/libindi/libindi.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libindi" -VERSION="2.0.6" -HOMEPAGE="https://www.indilib.org/" -DOWNLOAD="https://github.com/indilib/indi/archive/v2.0.6/indi-2.0.6.tar.gz" -MD5SUM="7ecc7c944743089ad9da35b0602de589" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libnova libev" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@linuxgalaxy.org" diff --git a/libraries/libindi/slack-desc b/libraries/libindi/slack-desc deleted file mode 100644 index c8394dc76e..0000000000 --- a/libraries/libindi/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libindi: libindi (Instrument Neutral Distributed Interface) -libindi: -libindi: INDI is a distributed control protocol designed to operate -libindi: astronomical instrumentation. INDI is small, flexible, easy to parse, -libindi: and scalable. It supports common DCS functions such as remote control, -libindi: data acquisition, monitoring, and a lot more. -libindi: -libindi: https://www.indilib.org/ -libindi: -libindi: -libindi: diff --git a/libraries/libiptcdata/libiptcdata.SlackBuild b/libraries/libiptcdata/libiptcdata.SlackBuild index b825e340f8..7eedbc9e1a 100644 --- a/libraries/libiptcdata/libiptcdata.SlackBuild +++ b/libraries/libiptcdata/libiptcdata.SlackBuild @@ -32,8 +32,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libiptcdata -VERSION=${VERSION:-1.0.4} -BUILD=${BUILD:-4} +VERSION=${VERSION:-1.0.5} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libiptcdata/libiptcdata.info b/libraries/libiptcdata/libiptcdata.info index 1059a4dc96..c8fb736c21 100644 --- a/libraries/libiptcdata/libiptcdata.info +++ b/libraries/libiptcdata/libiptcdata.info @@ -1,8 +1,8 @@ PRGNAM="libiptcdata" -VERSION="1.0.4" +VERSION="1.0.5" HOMEPAGE="http://libiptcdata.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/libiptcdata/libiptcdata-1.0.4.tar.gz" -MD5SUM="af886556ecb129b694f2d365d03d95a8" +DOWNLOAD="https://github.com/ianw/libiptcdata/releases/download/release_1_0_5/libiptcdata-1.0.5.tar.gz" +MD5SUM="c04bc1375c280d41c0106255d1df711a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libkml/libkml.SlackBuild b/libraries/libkml/libkml.SlackBuild index cb1971b54b..ffd832164c 100644 --- a/libraries/libkml/libkml.SlackBuild +++ b/libraries/libkml/libkml.SlackBuild @@ -88,6 +88,7 @@ cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR="lib${LIBDIRSUFFIX}" \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/libraries/liblangtag/liblangtag.SlackBuild b/libraries/liblangtag/liblangtag.SlackBuild index aebe04d1bb..1d9bf5fbb9 100644 --- a/libraries/liblangtag/liblangtag.SlackBuild +++ b/libraries/liblangtag/liblangtag.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=liblangtag -VERSION=${VERSION:-0.6.4} +VERSION=${VERSION:-0.6.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/liblangtag/liblangtag.info b/libraries/liblangtag/liblangtag.info index e71d19aa7f..2e7d3645aa 100644 --- a/libraries/liblangtag/liblangtag.info +++ b/libraries/liblangtag/liblangtag.info @@ -1,8 +1,8 @@ PRGNAM="liblangtag" -VERSION="0.6.4" +VERSION="0.6.7" HOMEPAGE="https://bitbucket.org/tagoh/liblangtag/wiki/Home" -DOWNLOAD="https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.6.4.tar.bz2" -MD5SUM="c93611c472b5875166b4a3a35a66a62d" +DOWNLOAD="https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.6.7.tar.bz2" +MD5SUM="5876517621f06944d9abda15508b8183" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/liblxqt/liblxqt.SlackBuild b/libraries/liblxqt/liblxqt.SlackBuild index 744872ac48..f57cf0138c 100644 --- a/libraries/liblxqt/liblxqt.SlackBuild +++ b/libraries/liblxqt/liblxqt.SlackBuild @@ -82,6 +82,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/libmpd/libmpd.SlackBuild b/libraries/libmpd/libmpd.SlackBuild index 52064d9cc1..e245a3c1b0 100644 --- a/libraries/libmpd/libmpd.SlackBuild +++ b/libraries/libmpd/libmpd.SlackBuild @@ -87,7 +87,7 @@ find -L . \ # http://repo.or.cz/w/libmpd.git/commit/4f946c01000fd97100e4a534b47f9c7ace0403df patch -p1 < $CWD/libmpd-internal.h.patch -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/libmspub/gcc15.patch b/libraries/libmspub/gcc15.patch new file mode 100644 index 0000000000..408b054937 --- /dev/null +++ b/libraries/libmspub/gcc15.patch @@ -0,0 +1,10 @@ +--- a/src/lib/Coordinate.h~ 2018-02-28 05:54:49.000000000 -0600 ++++ b/src/lib/Coordinate.h 2025-02-25 13:42:47.047701418 -0600 +@@ -10,6 +10,7 @@ + #ifndef INCLUDED_COORDINATE_H + #define INCLUDED_COORDINATE_H + ++#include + #include "MSPUBConstants.h" + + namespace libmspub diff --git a/libraries/libmspub/libmspub.SlackBuild b/libraries/libmspub/libmspub.SlackBuild index 281f04cdcc..66827d69f1 100644 --- a/libraries/libmspub/libmspub.SlackBuild +++ b/libraries/libmspub/libmspub.SlackBuild @@ -79,6 +79,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/gcc15.patch + case "${DOC:-0}" in 0) doc='--without-docs' ;; *) doc='--with-docs' ;; diff --git a/libraries/libnfs/libnfs.SlackBuild b/libraries/libnfs/libnfs.SlackBuild index 6fb9590a50..2c8d763220 100644 --- a/libraries/libnfs/libnfs.SlackBuild +++ b/libraries/libnfs/libnfs.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libnfs -VERSION=${VERSION:-5.0.2} +VERSION=${VERSION:-5.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libnfs/libnfs.info b/libraries/libnfs/libnfs.info index e375612ac3..51a446bbd2 100644 --- a/libraries/libnfs/libnfs.info +++ b/libraries/libnfs/libnfs.info @@ -1,8 +1,8 @@ PRGNAM="libnfs" -VERSION="5.0.2" +VERSION="5.0.3" HOMEPAGE="https://github.com/sahlberg/libnfs" -DOWNLOAD="https://github.com/sahlberg/libnfs/archive/libnfs-5.0.2/libnfs-libnfs-5.0.2.tar.gz" -MD5SUM="115034aab322d05235a9555d057f8b14" +DOWNLOAD="https://github.com/sahlberg/libnfs/archive/libnfs-5.0.3/libnfs-libnfs-5.0.3.tar.gz" +MD5SUM="27318b6192c960f440415d3284663162" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libnova/README b/libraries/libnova/README deleted file mode 100644 index de58ecb423..0000000000 --- a/libraries/libnova/README +++ /dev/null @@ -1,7 +0,0 @@ -libnova is a general purpose, double precision, celestial mechanics, -astrometry, and astrodynamics library. It is the calculation engine -used by the Nova project. - -The intended audience of libnova are C / C++ programmers, astronomers -and anyone else interested in calculating positions of astronomical -objects or celestial mechanics. diff --git a/libraries/libnova/libnova.SlackBuild b/libraries/libnova/libnova.SlackBuild deleted file mode 100644 index 0dcecdbb40..0000000000 --- a/libraries/libnova/libnova.SlackBuild +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/bash - -# Slackware build script for libnova - -# Copyright 2013 Chris Abela -# Copyright 2014 Ryan P.C. McQuen -# Copyright 2017 Philip Lacroix -# -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libnova -VERSION=${VERSION:-0.15.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -autoreconf -vif - -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 -C doc doc -make install DESTDIR=$PKG -rm -rf examples/.{deps,libs} - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -cp -a doc/man $PKG/usr/man -rm -f $PKG/usr/man/man3/_tmp*.3 -rm -f $PKG/usr/man/man3/version.3 # This conflicts with the Slackware perl package -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README doc/html examples \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libnova/libnova.info b/libraries/libnova/libnova.info deleted file mode 100644 index 5268ed8a90..0000000000 --- a/libraries/libnova/libnova.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libnova" -VERSION="0.15.0" -HOMEPAGE="http://libnova.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/libnova/libnova-0.15.0.tar.gz" -MD5SUM="756fdb55745cb78511f83a62c25f3be4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Philip Lacroix" -EMAIL="slackph at posteo dot de" diff --git a/libraries/libnova/slack-desc b/libraries/libnova/slack-desc deleted file mode 100644 index ea5d1c0b89..0000000000 --- a/libraries/libnova/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libnova: libnova (celestial mechanics, astrometry and astrodynamics library) -libnova: -libnova: libnova is a general purpose, double precision, celestial mechanics, -libnova: astrometry, and astrodynamics library. It is the calculation engine -libnova: used by the Nova project. -libnova: -libnova: The intended audience of libnova are C / C++ programmers, astronomers -libnova: and anyone else interested in calculating positions of astronomical -libnova: objects or celestial mechanics. -libnova: -libnova: Homepage: http://libnova.sourceforge.net/ diff --git a/libraries/liboauth/liboauth.SlackBuild b/libraries/liboauth/liboauth.SlackBuild index cf4be82ca7..0f9cb6344d 100644 --- a/libraries/liboauth/liboauth.SlackBuild +++ b/libraries/liboauth/liboauth.SlackBuild @@ -104,7 +104,7 @@ patch -p1 < $CWD/liboauth-1.0.3-openssl-1.1.0-3.patch # compile in clean dir mkdir -v build cd build -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" \ CXXFLAGS="$SLKCFLAGS" \ ../configure \ ${OPTS} \ diff --git a/libraries/libosinfo/libosinfo.SlackBuild b/libraries/libosinfo/libosinfo.SlackBuild index bf22358b53..2eeb34f7c2 100644 --- a/libraries/libosinfo/libosinfo.SlackBuild +++ b/libraries/libosinfo/libosinfo.SlackBuild @@ -78,6 +78,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/libxml2-2.14.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libosinfo/libxml2-2.14.patch b/libraries/libosinfo/libxml2-2.14.patch new file mode 100644 index 0000000000..71d620532c --- /dev/null +++ b/libraries/libosinfo/libxml2-2.14.patch @@ -0,0 +1,83 @@ +From 0adf38535637ec668e658d43f04f60f11f51574f Mon Sep 17 00:00:00 2001 +From: Roman Bogorodskiy +Date: Thu, 10 Apr 2025 13:54:02 +0200 +Subject: [PATCH] loader: don't use libxml2 deprecated APIs + +Address the following items: + + - Deprecated direct access to buf's content + - Mismatching error function signature + - Deprecated direct access to ctxt's lastError + +Signed-off-by: Roman Bogorodskiy +--- + osinfo/osinfo_loader.c | 42 +++++++++++++++++++++++------------------- + 1 file changed, 23 insertions(+), 19 deletions(-) + +diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c +index 0a9004af..b3fd4535 100644 +--- a/osinfo/osinfo_loader.c ++++ b/osinfo/osinfo_loader.c +@@ -354,7 +354,7 @@ osinfo_loader_doc(const char *xpath, + xmlXPathFreeObject(obj); + OSINFO_LOADER_SET_ERROR(err, "Cannot format stylesheet"); + } +- ret = g_strdup((char *)buf->content); ++ ret = g_strdup((char *)xmlBufferContent(buf)); + + xmlBufferFree(buf); + xmlXPathFreeObject(obj); +@@ -1902,28 +1902,32 @@ static void osinfo_loader_root(OsinfoLoader *loader, + } + + static void +-catchXMLError(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) ++catchXMLError(void *ctx, const char *msg, ...) + { + xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; ++ const xmlError *xmlErr = NULL; ++ g_autofree gchar *xmlmsg = NULL; + +- if (ctxt && ctxt->_private) { +- GError **err = ctxt->_private; +- if (!error_is_set(err)) { +- gchar *xmlmsg; +- if (ctxt->lastError.file) { +- xmlmsg = g_strdup_printf("%s:%d: %s", +- ctxt->lastError.file, +- ctxt->lastError.line, +- ctxt->lastError.message); +- } else { +- xmlmsg = g_strdup_printf("at line %d: %s", +- ctxt->lastError.line, +- ctxt->lastError.message); +- } +- OSINFO_LOADER_SET_ERROR(ctxt->_private, xmlmsg); +- g_free(xmlmsg); +- } ++ if (!ctxt || !ctxt->_private) ++ return; ++ ++ if (error_is_set(ctxt->_private)) ++ return; ++ ++ if (!(xmlErr = xmlCtxtGetLastError(ctx))) ++ return; ++ ++ if (xmlErr->file) { ++ xmlmsg = g_strdup_printf("%s:%d: %s", ++ xmlErr->file, ++ xmlErr->line, ++ xmlErr->message); ++ } else { ++ xmlmsg = g_strdup_printf("at line %d: %s", ++ xmlErr->line, ++ xmlErr->message); + } ++ OSINFO_LOADER_SET_ERROR(ctxt->_private, xmlmsg); + } + + static void osinfo_loader_process_xml(OsinfoLoader *loader, +-- +GitLab + diff --git a/libraries/libpano13/libpano13.SlackBuild b/libraries/libpano13/libpano13.SlackBuild index c82f37f5d2..6799a5f089 100644 --- a/libraries/libpano13/libpano13.SlackBuild +++ b/libraries/libpano13/libpano13.SlackBuild @@ -83,9 +83,10 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -std=gnu17" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/libportal/libportal.SlackBuild b/libraries/libportal/libportal.SlackBuild index 311f981efa..0ff9cf4e12 100644 --- a/libraries/libportal/libportal.SlackBuild +++ b/libraries/libportal/libportal.SlackBuild @@ -80,6 +80,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/qt-6.9.patch + sed -i "s|get_option('datadir') / 'doc'|get_option('prefix') / 'doc'|" doc/meson.build || exit 1 export PATH=/usr/lib$LIBDIRSUFFIX/qt6/libexec:$PATH diff --git a/libraries/libportal/qt-6.9.patch b/libraries/libportal/qt-6.9.patch new file mode 100644 index 0000000000..ed2b1ff8ca --- /dev/null +++ b/libraries/libportal/qt-6.9.patch @@ -0,0 +1,41 @@ +From 796053d2eebe4532aad6bd3fd80cdf3b197806ec Mon Sep 17 00:00:00 2001 +From: Jan Grulich +Date: Thu, 27 Mar 2025 09:38:10 +0100 +Subject: [PATCH] qt6: fix build against Qt 6.9+ + +QGenericUnixServices was renamed to QDesktopUnixServices in Qt 6.9. + +Upstream change: https://codereview.qt-project.org/c/qt/qtbase/+/609639 +--- + libportal/portal-qt6.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/libportal/portal-qt6.cpp b/libportal/portal-qt6.cpp +index d38a4e30..34f0d72a 100644 +--- a/libportal/portal-qt6.cpp ++++ b/libportal/portal-qt6.cpp +@@ -31,8 +31,12 @@ + #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) + #include + #include ++#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) ++#include ++#else + #include + #endif ++#endif + + static gboolean + _xdp_parent_export_qt (XdpParent *parent, +@@ -45,7 +49,11 @@ _xdp_parent_export_qt (XdpParent *parent, + } + + #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) ++#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) ++ if (const auto services = dynamic_cast(QGuiApplicationPrivate::platformIntegration()->services())) ++#else + if (const auto services = dynamic_cast(QGuiApplicationPrivate::platformIntegration()->services())) ++#endif + { + g_autofree char *handle = g_strdup(services->portalWindowIdentifier(w).toUtf8().constData()); + diff --git a/libraries/libpst/libpst.SlackBuild b/libraries/libpst/libpst.SlackBuild index f02b91fcd1..961040a167 100644 --- a/libraries/libpst/libpst.SlackBuild +++ b/libraries/libpst/libpst.SlackBuild @@ -99,58 +99,29 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -buildit() { - autoreconf -if - - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --enable-dii \ - --disable-static \ - --enable-libpst-shared \ - --enable-python \ - --build=$ARCH-slackware-linux - - make - # ./configure options --docdir and --htmldir have no effect, - # it is necessary to override "htmldir" and "htmldeveldir" - make install-strip DESTDIR=$PKG \ - htmldir=/usr/doc/$PRGNAM-$VERSION \ - htmldeveldir=/usr/doc/$PRGNAM-$VERSION/devel -} - -# 20211019 bkw: python3 builds work now. Include support for both -# python versions, 2 and 3. Unfortunately this means building the -# entire project twice (keeping only the python2 stuff from the -# first build). autotools doesn't make it easy or even necessarily -# possible to build only part of a project :( - -# Python 2 build. If python2 ever really does go away, this code will -# silently omit python2 support from the package. -if type -p python2 &>/dev/null; then - PY2VER="$( python2 --version 2>&1 | cut -d' ' -f2 | cut -d. -f1,2 )" - - # ./configure --help claims that I can set PYTHON_VERSION in the environment - # and it'll use that, but it doesn't work. So I have to use this abomination: - sed -i.bak 's,\,python'$PY2VER',g' m4/ax_python.m4 - - buildit - - mv $PKG/usr/lib$LIBDIRSUFFIX/python$PY2VER $PKG/.keep.python2 - rm -rf $PKG/* - - # put everything back the way it was. - make distclean - mv m4/ax_python.m4.bak m4/ax_python.m4 -fi - -# Python 3 build -buildit -[ -e $PKG/.keep.python2 ] && \ - mv $PKG/.keep.python2 $PKG/usr/lib$LIBDIRSUFFIX/python$PY2VER +# patches from fedora (thanks!) +for i in $CWD/patches/* ; do patch -p1 < $i ; done + +autoreconf -if + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-dii \ + --disable-static \ + --enable-libpst-shared \ + --enable-python \ + --build=$ARCH-slackware-linux + +make +# ./configure options --docdir and --htmldir have no effect, +# it is necessary to override "htmldir" and "htmldeveldir" +make install-strip DESTDIR=$PKG \ + htmldir=/usr/doc/$PRGNAM-$VERSION \ + htmldeveldir=/usr/doc/$PRGNAM-$VERSION/devel gzip -9 $PKG/usr/man/man?/*.? diff --git a/libraries/libpst/patches/0002-incompatible-pointer-i686.patch b/libraries/libpst/patches/0002-incompatible-pointer-i686.patch new file mode 100644 index 0000000000..8c7c72d347 --- /dev/null +++ b/libraries/libpst/patches/0002-incompatible-pointer-i686.patch @@ -0,0 +1,12 @@ +diff -up libpst-0.6.76/src/libpst.c.incompatible-pointer-i686 libpst-0.6.76/src/libpst.c +--- libpst-0.6.76/src/libpst.c.incompatible-pointer-i686 2024-01-22 17:39:52.792216627 +0100 ++++ libpst-0.6.76/src/libpst.c 2024-01-22 17:40:35.788761273 +0100 +@@ -3828,7 +3828,7 @@ static size_t pst_read_block_size(pst_fi + return -1; + } + *buf = (char *) pst_malloc(inflated_size); +- size_t result_size = inflated_size; ++ unsigned long result_size = inflated_size; + if (uncompress((Bytef *) *buf, &result_size, (Bytef *) zbuf, size) != Z_OK || result_size != inflated_size) { + DEBUG_WARN(("Failed to uncompress %i bytes to %i bytes, got %i\n", size, inflated_size, result_size)); + if (zbuf) free(zbuf); diff --git a/libraries/libpst/patches/0003-gcc-c23-changes.patch b/libraries/libpst/patches/0003-gcc-c23-changes.patch new file mode 100644 index 0000000000..5fc00b4776 --- /dev/null +++ b/libraries/libpst/patches/0003-gcc-c23-changes.patch @@ -0,0 +1,20 @@ +diff -up libpst-0.6.76/src/readpst.c.gcc-changes libpst-0.6.76/src/readpst.c +--- libpst-0.6.76/src/readpst.c.gcc-changes 2025-01-22 08:18:34.846378892 +0100 ++++ libpst-0.6.76/src/readpst.c 2025-01-22 08:18:42.508459826 +0100 +@@ -26,7 +26,6 @@ struct file_ll { + int32_t skip_count; + }; + +-int grim_reaper(); + pid_t try_fork(char* folder); + void process(pst_item *outeritem, pst_desc_tree *d_ptr); + void write_email_body(FILE *f, char *body); +@@ -152,7 +151,7 @@ sem_t* output_mutex = NULL; + #endif + + +-int grim_reaper(int waitall) ++static int grim_reaper(int waitall) + { + int available = 0; + #ifdef HAVE_FORK diff --git a/libraries/libpst/patches/m4-python310.patch b/libraries/libpst/patches/m4-python310.patch new file mode 100644 index 0000000000..5bf0609452 --- /dev/null +++ b/libraries/libpst/patches/m4-python310.patch @@ -0,0 +1,28 @@ +https://github.com/autoconf-archive/autoconf-archive/pull/235 + +diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 +index 9d4eecf7..d30ee943 100644 +--- a/m4/ax_python_devel.m4 ++++ b/m4/ax_python_devel.m4 +@@ -190,7 +190,7 @@ EOD` + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[[:3]])"` ++ print ("%d.%d" % sys.version_info[[:2]])"` + fi + fi + +diff --git a/m4/ax_python.m4 b/m4/ax_python.m4 +index 7c9f511f..c2577905 100644 +--- a/m4/ax_python.m4 ++++ b/m4/ax_python.m4 +@@ -55,7 +55,7 @@ + AC_DEFUN([AX_PYTHON], + [AC_MSG_CHECKING(for python build information) + AC_MSG_RESULT([]) +-for python in python3.9 python3.8 python3.7 python3.6 python3.5 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do ++for python in python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do + AC_CHECK_PROGS(PYTHON_BIN, [$python]) + ax_python_bin=$PYTHON_BIN + if test x$ax_python_bin != x; then diff --git a/libraries/libquicktime/libquicktime-ffmpeg3.patch b/libraries/libquicktime/libquicktime-ffmpeg3.patch deleted file mode 100644 index f5784e8229..0000000000 --- a/libraries/libquicktime/libquicktime-ffmpeg3.patch +++ /dev/null @@ -1,935 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/video.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -37,10 +37,10 @@ - #endif - - --#ifdef PIX_FMT_YUV422P10 --#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 -+#ifdef AV_PIX_FMT_YUV422P10 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 - #else --#define PIX_FMT_YUV422P10_OR_DUMMY -1234 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 - #endif - - #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) -@@ -90,9 +90,9 @@ typedef struct - int imx_bitrate; - int imx_strip_vbi; - -- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while -- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ -- enum PixelFormat reinterpret_pix_fmt; -+ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while -+ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ -+ enum AVPixelFormat reinterpret_pix_fmt; - - int is_imx; - int y_offset; -@@ -137,42 +137,42 @@ typedef struct - - static const struct - { -- enum PixelFormat ffmpeg_id; -+ enum AVPixelFormat ffmpeg_id; - int lqt_id; - int exact; - } - colormodels[] = - { -- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) -+ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_YUV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, - #else -- { PIX_FMT_YUYV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, - #endif -- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) --#ifdef PIX_FMT_YUV422P10 -- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 --#endif -- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) -+ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -+ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -+ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -+ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -+ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+#ifdef AV_PIX_FMT_YUV422P10 -+ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 -+#endif -+ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -+ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #else -- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #endif -- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -- { PIX_FMT_GRAY8, BC_RGB888, 0 }, -- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) -+ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -+ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, -+ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -+ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -+ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -+ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) - }; - - static const struct -@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV - if (!codec->pix_fmts) - return 0; - -- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) -+ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) - { -- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) -+ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) - return 1; - } - - return 0; - } - --static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) -+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) - { - int i; - -@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f - if(colormodels[i].lqt_id == id) - return colormodels[i].ffmpeg_id; - } -- return PIX_FMT_NB; -+ return AV_PIX_FMT_NB; - } - --static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) -+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) - { - int i; - -@@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co - /* First we try codec-specific colormodel matching. */ - if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which -- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) -+ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which -+ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ -+ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) - { -- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); -+ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); - *exact = 1; - if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) - { - vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; -- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; -+ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except - // there is no such colormodel in FFMpeg. Fortunately, it's not a problem - // in this case, as reinterpret_pix_fmt is only used when *exact == 0. - } - else - { - vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; - } - return; - } -@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co - - if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 -- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 -+ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 -+ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 - (in fact, the latter doesn't even exist) */ -- codec->avctx->pix_fmt = PIX_FMT_YUV422P; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; - if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) - { - if (lqt_tenbit_dnxhd_supported(codec->encoder)) -- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; - } - } - } -@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co - /* From avcodec.h: */ - - /* -- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA -+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA - * color is put together as: - * (A << 24) | (R << 16) | (G << 8) | B - * This is stored as BGRA on little endian CPU architectures and ARGB on -@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t - */ - - static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, -- AVFrame * in_frame, enum PixelFormat in_format, -+ AVFrame * in_frame, enum AVPixelFormat in_format, - unsigned char ** out_frame, int out_format, - int width, int height, int row_span, int row_span_uv) - { -@@ -547,9 +547,9 @@ static void convert_image_decode(quickti - * RGBA format like in ffmpeg?? - */ - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) - #else -- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) - #endif - { - convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); -@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick - if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) - return -1; - #endif -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - vtrack->stream_cmodel = LQT_COLORMODEL_NONE; - codec->initialized = 1; - } -@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick - #ifdef HAVE_LIBSWSCALE - - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #else -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #endif - { -@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick - - if(!codec->initialized) - { -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - - /* time_base is 1/framerate for constant framerate */ - -@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick - if(vtrack->stream_cmodel == BC_RGBA8888) - { - /* Libquicktime doesn't natively support a color model equivalent -- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. -+ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. - So, we use BC_RGBA8888 and do ad hoc conversion below. */ -- codec->avctx->pix_fmt = PIX_FMT_ARGB; -+ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick - } - // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); - -- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - if(!codec->tmp_rows) - { -@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick - vtrack->stream_cmodel, - 0, 0, 0, codec->y_offset); - } -- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, - codec->tmp_rows[0], codec->tmp_row_span, -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -1266,7 +1266,7 @@ static int lqt_ffmpeg_encode_audio(quick - pkt.data = codec->chunk_buffer; - pkt.size = codec->chunk_buffer_alloc; - -- avcodec_get_frame_defaults(&f); -+ av_frame_unref(&f); - f.nb_samples = codec->avctx->frame_size; - - avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, ---- libquicktime-1.2.4/plugins/ffmpeg/lqt_ffmpeg.c.orig 2016-02-17 08:11:50.683023612 +0000 -+++ libquicktime-1.2.4/plugins/ffmpeg/lqt_ffmpeg.c 2016-02-17 08:12:20.362898974 +0000 -@@ -370,7 +370,7 @@ - struct CODECIDMAP codecidmap_v[] = - { - { -- .id = CODEC_ID_MPEG1VIDEO, -+ .id = AV_CODEC_ID_MPEG1VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -381,7 +381,7 @@ - .wav_ids = { LQT_WAV_ID_NONE } - }, - { -- .id = CODEC_ID_MPEG4, -+ .id = AV_CODEC_ID_MPEG4, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -399,7 +399,7 @@ - .compression_id = LQT_COMPRESSION_MPEG4_ASP, - }, - { -- .id = CODEC_ID_MSMPEG4V1, -+ .id = AV_CODEC_ID_MSMPEG4V1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -410,7 +410,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V2, -+ .id = AV_CODEC_ID_MSMPEG4V2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -421,7 +421,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -437,7 +437,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -452,7 +452,7 @@ - }, - #if 0 - { -- .id = CODEC_ID_WMV1, -+ .id = AV_CODEC_ID_WMV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -465,7 +465,7 @@ - }, - #endif - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -477,7 +477,7 @@ - .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP, - }, - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -492,7 +492,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_H264, -+ .id = AV_CODEC_ID_H264, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -503,7 +503,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_H263P, -+ .id = AV_CODEC_ID_H263P, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -517,7 +517,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_H263I, -+ .id = AV_CODEC_ID_H263I, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -528,7 +528,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ1, -+ .id = AV_CODEC_ID_SVQ1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -539,7 +539,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ3, -+ .id = AV_CODEC_ID_SVQ3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -550,7 +550,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MJPEG, -+ .id = AV_CODEC_ID_MJPEG, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -564,7 +564,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_MJPEGB, -+ .id = AV_CODEC_ID_MJPEGB, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -578,7 +578,7 @@ - }, - #if LIBAVCODEC_BUILD >= 3346688 - { -- .id = CODEC_ID_TARGA, -+ .id = AV_CODEC_ID_TARGA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -590,7 +590,7 @@ - #endif - #if LIBAVCODEC_BUILD >= 3347456 - { -- .id = CODEC_ID_TIFF, -+ .id = AV_CODEC_ID_TIFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -601,7 +601,7 @@ - }, - #endif - { -- .id = CODEC_ID_8BPS, -+ .id = AV_CODEC_ID_8BPS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -611,7 +611,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_INDEO3, -+ .id = AV_CODEC_ID_INDEO3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -622,7 +622,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_RPZA, -+ .id = AV_CODEC_ID_RPZA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -632,7 +632,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SMC, -+ .id = AV_CODEC_ID_SMC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -642,7 +642,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CINEPAK, -+ .id = AV_CODEC_ID_CINEPAK, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -653,7 +653,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CYUV, -+ .id = AV_CODEC_ID_CYUV, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -664,7 +664,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_QTRLE, -+ .id = AV_CODEC_ID_QTRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -677,7 +677,7 @@ - .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE }, - }, - { -- .id = CODEC_ID_MSRLE, -+ .id = AV_CODEC_ID_MSRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -687,7 +687,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -703,7 +703,7 @@ - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -719,7 +719,7 @@ - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -735,7 +735,7 @@ - }, - /* DVCPRO HD (decoding only for now) */ - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -756,7 +756,7 @@ - // .do_encode = 1 - }, - { -- .id = CODEC_ID_FFVHUFF, -+ .id = AV_CODEC_ID_FFVHUFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -769,7 +769,7 @@ - .do_encode = 1 - }, - { -- .id = CODEC_ID_FFV1, -+ .id = AV_CODEC_ID_FFV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -785,7 +785,7 @@ - }, - #if LIBAVCODEC_BUILD >= 3352576 - { -- .id = CODEC_ID_DNXHD, -+ .id = AV_CODEC_ID_DNXHD, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -801,7 +801,7 @@ - }, - #endif - { -- .id = CODEC_ID_MPEG2VIDEO, -+ .id = AV_CODEC_ID_MPEG2VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -823,7 +823,7 @@ - struct CODECIDMAP codecidmap_a[] = - { - { -- .id = CODEC_ID_MP3, -+ .id = AV_CODEC_ID_MP3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -835,7 +835,7 @@ - .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MP2, -+ .id = AV_CODEC_ID_MP2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -850,7 +850,7 @@ - .compression_id = LQT_COMPRESSION_MP2, - }, - { -- .id = CODEC_ID_AC3, -+ .id = AV_CODEC_ID_AC3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -865,7 +865,7 @@ - .compression_id = LQT_COMPRESSION_AC3, - }, - { -- .id = CODEC_ID_QDM2, -+ .id = AV_CODEC_ID_QDM2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -880,7 +880,7 @@ - #if 1 - /* Doesn't work as long as audio chunks are not split into VBR "Samples" */ - { -- .id = CODEC_ID_ALAC, -+ .id = AV_CODEC_ID_ALAC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -893,7 +893,7 @@ - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_MS, -+ .id = AV_CODEC_ID_ADPCM_MS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -906,7 +906,7 @@ - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_IMA_WAV, -+ .id = AV_CODEC_ID_ADPCM_IMA_WAV, - .index = -1, - .encoder = NULL, - .decoder = NULL, ---- libquicktime-1.2.4/plugins/ffmpeg/video.c.orig 2016-02-17 08:14:18.585735622 +0000 -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c 2016-02-17 08:14:35.332331900 +0000 -@@ -400,7 +400,7 @@ - codec->reinterpret_pix_fmt = codec->avctx->pix_fmt; - - /* First we try codec-specific colormodel matching. */ -- if(codec->decoder->id == CODEC_ID_DNXHD) -+ if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { - /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which - we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ -@@ -438,7 +438,7 @@ - quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv; - codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel); - -- if (codec->encoder->id == CODEC_ID_DNXHD) -+ if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { - /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 - and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 -@@ -728,13 +728,13 @@ - - /* Set extradata: It's done differently for each codec */ - -- if(codec->decoder->id == CODEC_ID_SVQ3) -+ if(codec->decoder->id == AV_CODEC_ID_SVQ3) - { - extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4; - extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4; - - } -- else if(codec->decoder->id == CODEC_ID_H264) -+ else if(codec->decoder->id == AV_CODEC_ID_H264) - { - user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len); - -@@ -753,7 +753,7 @@ - } - - } -- else if(codec->decoder->id == CODEC_ID_MPEG4) -+ else if(codec->decoder->id == AV_CODEC_ID_MPEG4) - { - if(trak->mdia.minf.stbl.stsd.table[0].has_esds) - { -@@ -947,15 +947,15 @@ - } - #endif - } -- if(codec->decoder->id == CODEC_ID_DVVIDEO) -+ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST; - vtrack->ci.id = LQT_COMPRESSION_DV; - } -- else if((codec->decoder->id == CODEC_ID_MPEG4) || -- (codec->decoder->id == CODEC_ID_H264)) -+ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) || -+ (codec->decoder->id == AV_CODEC_ID_H264)) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; -@@ -1299,13 +1299,13 @@ - { - if(vtrack->stream_cmodel == BC_YUV420P) - { -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; - /* enable interlaced encoding */ - vtrack->interlace_mode = LQT_INTERLACE_NONE; - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - } -@@ -1340,7 +1340,7 @@ - codec->avctx->sample_aspect_ratio.num = pixel_width; - codec->avctx->sample_aspect_ratio.den = pixel_height; - /* Use global headers for mp4v */ -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1364,12 +1364,12 @@ - } - #endif - } -- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) && -+ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) && - !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4)) - { - strncpy(trak->strl->strh.fccHandler, "div3", 4); - } -- else if((codec->encoder->id == CODEC_ID_H263) && -+ else if((codec->encoder->id == AV_CODEC_ID_H263) && - (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP))) - { - uint8_t d263_data[] = -@@ -1383,7 +1383,7 @@ - strncpy(trak->mdia.minf.stbl.stsd.table[0].format, - "s263", 4); - } -- else if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1391,7 +1391,7 @@ - codec->write_global_header = 1; - } - } -- else if(codec->encoder->id == CODEC_ID_QTRLE) -+ else if(codec->encoder->id == AV_CODEC_ID_QTRLE) - { - if(vtrack->stream_cmodel == BC_RGBA8888) - { -@@ -1402,11 +1402,11 @@ - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - set_dv_fourcc(width, height, vtrack->stream_cmodel, trak); - } -- else if(codec->encoder->id == CODEC_ID_DNXHD) -+ else if(codec->encoder->id == AV_CODEC_ID_DNXHD) - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -@@ -1558,12 +1558,12 @@ - - #endif - -- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD) -+ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD) - setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded); - - if(bytes_encoded) - { -- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0)) -+ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0)) - { - /* Some codecs don't bother generating presentation timestamps. - FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */ -@@ -1590,13 +1590,13 @@ - - if(codec->write_global_header && !codec->global_header_written) - { -- if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms, - "glbl", - codec->avctx->extradata, codec->avctx->extradata_size ); - } -- else if(codec->encoder->id == CODEC_ID_MPEG4) -+ else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; - if(codec->avctx->max_b_frames || -@@ -1903,18 +1903,18 @@ - codec_base->encode_video = lqt_ffmpeg_encode_video; - codec_base->set_pass = set_pass_ffmpeg; - -- if(encoder->id == CODEC_ID_MPEG4) -+ if(encoder->id == AV_CODEC_ID_MPEG4) - { - codec_base->writes_compressed = writes_compressed_mpeg4; - codec_base->init_compressed = init_compressed_mpeg4; - codec_base->write_packet = write_packet_mpeg4; - } -- else if(encoder->id == CODEC_ID_MPEG2VIDEO) -+ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO) - { - codec_base->writes_compressed = writes_compressed_imx; - codec_base->init_compressed = init_compressed_imx; - } -- else if(encoder->id == CODEC_ID_DVVIDEO) -+ else if(encoder->id == AV_CODEC_ID_DVVIDEO) - { - codec_base->init_compressed = init_compressed_dv; - } -@@ -1922,7 +1922,7 @@ - } - if(decoder) - { -- if(decoder->id == CODEC_ID_H264) -+ if(decoder->id == AV_CODEC_ID_H264) - codec_base->read_packet = read_packet_h264; - codec_base->decode_video = lqt_ffmpeg_decode_video; - } ---- libquicktime-1.2.4/plugins/ffmpeg/audio.c.orig 2016-02-17 08:17:57.421481934 +0000 -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c 2016-02-17 08:18:05.254782305 +0000 -@@ -626,7 +626,7 @@ - { - /* If the codec is mp3, make sure to decode the very last frame */ - -- if((codec->avctx->codec_id == CODEC_ID_MP3) && -+ if((codec->avctx->codec_id == AV_CODEC_ID_MP3) && - (codec->bytes_in_chunk_buffer >= 4)) - { - if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0)) -@@ -695,7 +695,7 @@ - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ - -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - if(codec->bytes_in_chunk_buffer < 4) - { -@@ -806,7 +806,7 @@ - - if(bytes_decoded < 0) - { -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - /* For mp3, bytes_decoded < 0 means, that the frame should be muted */ - memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end - -@@ -866,8 +866,8 @@ - quicktime_audio_map_t *track_map = &file->atracks[track]; - quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv; - -- if((codec->decoder->id == CODEC_ID_MP2) || -- (codec->decoder->id == CODEC_ID_MP3)) -+ if((codec->decoder->id == AV_CODEC_ID_MP2) || -+ (codec->decoder->id == AV_CODEC_ID_MP3)) - { - mpa_header h; - uint32_t header; -@@ -909,7 +909,7 @@ - else - track_map->ci.bitrate = h.bitrate; - } -- else if(codec->decoder->id == CODEC_ID_AC3) -+ else if(codec->decoder->id == AV_CODEC_ID_AC3) - { - a52_header h; - uint8_t * ptr; -@@ -986,7 +986,7 @@ - #endif - /* Some codecs need extra stuff */ - -- if(codec->decoder->id == CODEC_ID_ALAC) -+ if(codec->decoder->id == AV_CODEC_ID_ALAC) - { - header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len); - if(header) -@@ -995,7 +995,7 @@ - codec->avctx->extradata_size = header_len; - } - } -- if(codec->decoder->id == CODEC_ID_QDM2) -+ if(codec->decoder->id == AV_CODEC_ID_QDM2) - { - header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len); - if(header) -@@ -1495,9 +1495,9 @@ - codec_base->decode_audio = lqt_ffmpeg_decode_audio; - codec_base->set_parameter = set_parameter; - -- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2)) -+ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2)) - codec_base->read_packet = read_packet_mpa; -- else if(decoder->id == CODEC_ID_AC3) -+ else if(decoder->id == AV_CODEC_ID_AC3) - { - codec_base->write_packet = write_packet_ac3; - codec_base->read_packet = read_packet_ac3; diff --git a/libraries/libquicktime/libquicktime.SlackBuild b/libraries/libquicktime/libquicktime.SlackBuild index 522d29632b..04af7cf102 100644 --- a/libraries/libquicktime/libquicktime.SlackBuild +++ b/libraries/libquicktime/libquicktime.SlackBuild @@ -80,17 +80,21 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# Fix compatibility with ffmpeg 4.x -patch -p1 -i $CWD/libquicktime-1.2.4-ffmpeg2.patch -patch -p1 -i $CWD/libquicktime-ffmpeg3.patch -patch -p1 -i $CWD/libquicktime-1.2.4-ffmpeg4.patch - -# Fix compiling against newer faad2 -patch -p1 -i $CWD/libquicktime-1.2.4-faad2.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-CVE-2016-2399.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-CVE-2017-9122_et_al.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-faad2.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-ffmpeg2.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-ffmpeg29.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-ffmpeg4.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-libavutil.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-ffmpeg-codecs.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-ffmpeg5.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-qtpng.patch +patch -p1 -i $CWD/patches/libquicktime-1.2.4-ffmpeg7.patch autoreconf -vif -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu17" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -101,6 +105,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-gpl \ --with-libdv \ + --with-ffmpeg \ --build=$ARCH-slackware-linux make diff --git a/libraries/libquicktime/patches/libquicktime-1.2.4-CVE-2016-2399.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-CVE-2016-2399.patch new file mode 100644 index 0000000000..a1737c0dc0 --- /dev/null +++ b/libraries/libquicktime/patches/libquicktime-1.2.4-CVE-2016-2399.patch @@ -0,0 +1,25 @@ +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855099 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2399 + +diff --git a/src/util.c b/src/util.c +index d8dc3c3..9422fc5 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -340,9 +340,14 @@ int64_t quicktime_byte_position(quicktime_t *file) + + void quicktime_read_pascal(quicktime_t *file, char *data) + { +- char len = quicktime_read_char(file); +- quicktime_read_data(file, (uint8_t*)data, len); +- data[(int)len] = 0; ++ int len = quicktime_read_char(file); ++ if ((len > 0) && (len < 256)) { ++ /* data[] is expected to be 256 bytes long */ ++ quicktime_read_data(file, (uint8_t*)data, len); ++ data[len] = 0; ++ } else { ++ data[0] = 0; ++ } + } + + void quicktime_write_pascal(quicktime_t *file, char *data) diff --git a/libraries/libquicktime/patches/libquicktime-1.2.4-CVE-2017-9122_et_al.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-CVE-2017-9122_et_al.patch new file mode 100644 index 0000000000..06fb7b3375 --- /dev/null +++ b/libraries/libquicktime/patches/libquicktime-1.2.4-CVE-2017-9122_et_al.patch @@ -0,0 +1,151 @@ +From: Burkhard Plaum +Origin: https://sourceforge.net/p/libquicktime/mailman/libquicktime-devel/?viewmonth=201706 + +Hi, + +I committed some (mostly trivial) updates to CVS. The following CVE's +are fixed and/or no longer reproducible: + +CVE-2017-9122 +CVE-2017-9123 +CVE-2017-9124 +CVE-2017-9125 +CVE-2017-9126 +CVE-2017-9127 +CVE-2017-9128 + +I was a bit surprised that one simple sanity check fixes a whole bunch of files. + +So it could be, that the problems are still there, but better hidden since the +critical code isn't executed anymore with the sample files I got. + +If someone encounters more crashes, feel free to report them. + +Burkhard + +--- a/include/lqt_funcprotos.h ++++ b/include/lqt_funcprotos.h +@@ -1345,9 +1345,9 @@ int quicktime_write_int32_le(quicktime_t + int quicktime_write_char32(quicktime_t *file, char *string); + float quicktime_read_fixed16(quicktime_t *file); + int quicktime_write_fixed16(quicktime_t *file, float number); +-unsigned long quicktime_read_uint32(quicktime_t *file); +-long quicktime_read_int32(quicktime_t *file); +-long quicktime_read_int32_le(quicktime_t *file); ++uint32_t quicktime_read_uint32(quicktime_t *file); ++int32_t quicktime_read_int32(quicktime_t *file); ++int32_t quicktime_read_int32_le(quicktime_t *file); + int64_t quicktime_read_int64(quicktime_t *file); + int64_t quicktime_read_int64_le(quicktime_t *file); + long quicktime_read_int24(quicktime_t *file); +--- a/src/atom.c ++++ b/src/atom.c +@@ -131,6 +131,9 @@ int quicktime_atom_read_header(quicktime + atom->size = read_size64(header); + atom->end = atom->start + atom->size; + } ++/* Avoid broken files */ ++ if(atom->end > file->total_length) ++ result = 1; + } + + +--- a/src/lqt_quicktime.c ++++ b/src/lqt_quicktime.c +@@ -1788,8 +1788,8 @@ int quicktime_read_info(quicktime_t *fil + quicktime_set_position(file, start_position); + free(temp); + +- quicktime_read_moov(file, &file->moov, &leaf_atom); +- got_header = 1; ++ if(!quicktime_read_moov(file, &file->moov, &leaf_atom)) ++ got_header = 1; + } + else + quicktime_atom_skip(file, &leaf_atom); +--- a/src/moov.c ++++ b/src/moov.c +@@ -218,7 +218,8 @@ int quicktime_read_moov(quicktime_t *fil + if(quicktime_atom_is(&leaf_atom, "trak")) + { + quicktime_trak_t *trak = quicktime_add_trak(file); +- quicktime_read_trak(file, trak, &leaf_atom); ++ if(quicktime_read_trak(file, trak, &leaf_atom)) ++ return 1; + } + else + if(quicktime_atom_is(&leaf_atom, "udta")) +--- a/src/trak.c ++++ b/src/trak.c +@@ -269,6 +269,14 @@ int quicktime_read_trak(quicktime_t *fil + else quicktime_atom_skip(file, &leaf_atom); + } while(quicktime_position(file) < trak_atom->end); + ++ /* Do some sanity checks to prevent later crashes */ ++ if(trak->mdia.minf.is_video || trak->mdia.minf.is_video) ++ { ++ if(!trak->mdia.minf.stbl.stsc.table || ++ !trak->mdia.minf.stbl.stco.table) ++ return 1; ++ } ++ + #if 1 + if(trak->mdia.minf.is_video && + quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "drac")) +--- a/src/util.c ++++ b/src/util.c +@@ -647,10 +647,10 @@ int quicktime_write_fixed16(quicktime_t + return quicktime_write_data(file, data, 2); + } + +-unsigned long quicktime_read_uint32(quicktime_t *file) ++uint32_t quicktime_read_uint32(quicktime_t *file) + { +- unsigned long result; +- unsigned long a, b, c, d; ++ uint32_t result; ++ uint32_t a, b, c, d; + uint8_t data[4]; + + quicktime_read_data(file, data, 4); +@@ -663,10 +663,10 @@ unsigned long quicktime_read_uint32(quic + return result; + } + +-long quicktime_read_int32(quicktime_t *file) ++int32_t quicktime_read_int32(quicktime_t *file) + { +- unsigned long result; +- unsigned long a, b, c, d; ++ uint32_t result; ++ uint32_t a, b, c, d; + uint8_t data[4]; + + quicktime_read_data(file, data, 4); +@@ -676,13 +676,13 @@ long quicktime_read_int32(quicktime_t *f + d = data[3]; + + result = (a << 24) | (b << 16) | (c << 8) | d; +- return (long)result; ++ return (int32_t)result; + } + +-long quicktime_read_int32_le(quicktime_t *file) ++int32_t quicktime_read_int32_le(quicktime_t *file) + { +- unsigned long result; +- unsigned long a, b, c, d; ++ uint32_t result; ++ uint32_t a, b, c, d; + uint8_t data[4]; + + quicktime_read_data(file, data, 4); +@@ -692,7 +692,7 @@ long quicktime_read_int32_le(quicktime_t + d = data[3]; + + result = (d << 24) | (c << 16) | (b << 8) | a; +- return (long)result; ++ return (int32_t)result; + } + + int64_t quicktime_read_int64(quicktime_t *file) diff --git a/libraries/libquicktime/libquicktime-1.2.4-faad2.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-faad2.patch similarity index 100% rename from libraries/libquicktime/libquicktime-1.2.4-faad2.patch rename to libraries/libquicktime/patches/libquicktime-1.2.4-faad2.patch diff --git a/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg-codecs.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg-codecs.patch new file mode 100644 index 0000000000..8de9a288c1 --- /dev/null +++ b/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg-codecs.patch @@ -0,0 +1,651 @@ +diff -ruN a/plugins/ffmpeg/audio.c b/plugins/ffmpeg/audio.c +--- a/plugins/ffmpeg/audio.c 2012-03-29 21:44:28.000000000 +0200 ++++ b/plugins/ffmpeg/audio.c 2020-02-09 19:08:03.716063846 +0100 +@@ -626,7 +626,7 @@ + { + /* If the codec is mp3, make sure to decode the very last frame */ + +- if((codec->avctx->codec_id == CODEC_ID_MP3) && ++ if((codec->avctx->codec_id == AV_CODEC_ID_MP3) && + (codec->bytes_in_chunk_buffer >= 4)) + { + if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0)) +@@ -695,7 +695,7 @@ + + /* Some really broken mp3 files have the header bytes split across 2 chunks */ + +- if(codec->avctx->codec_id == CODEC_ID_MP3) ++ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) + { + if(codec->bytes_in_chunk_buffer < 4) + { +@@ -806,7 +806,7 @@ + + if(bytes_decoded < 0) + { +- if(codec->avctx->codec_id == CODEC_ID_MP3) ++ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) + { + /* For mp3, bytes_decoded < 0 means, that the frame should be muted */ + memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end - +@@ -866,8 +866,8 @@ + quicktime_audio_map_t *track_map = &file->atracks[track]; + quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv; + +- if((codec->decoder->id == CODEC_ID_MP2) || +- (codec->decoder->id == CODEC_ID_MP3)) ++ if((codec->decoder->id == AV_CODEC_ID_MP2) || ++ (codec->decoder->id == AV_CODEC_ID_MP3)) + { + mpa_header h; + uint32_t header; +@@ -909,7 +909,7 @@ + else + track_map->ci.bitrate = h.bitrate; + } +- else if(codec->decoder->id == CODEC_ID_AC3) ++ else if(codec->decoder->id == AV_CODEC_ID_AC3) + { + a52_header h; + uint8_t * ptr; +@@ -986,7 +986,7 @@ + #endif + /* Some codecs need extra stuff */ + +- if(codec->decoder->id == CODEC_ID_ALAC) ++ if(codec->decoder->id == AV_CODEC_ID_ALAC) + { + header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len); + if(header) +@@ -995,7 +995,7 @@ + codec->avctx->extradata_size = header_len; + } + } +- if(codec->decoder->id == CODEC_ID_QDM2) ++ if(codec->decoder->id == AV_CODEC_ID_QDM2) + { + header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len); + if(header) +@@ -1495,9 +1495,9 @@ + codec_base->decode_audio = lqt_ffmpeg_decode_audio; + codec_base->set_parameter = set_parameter; + +- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2)) ++ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2)) + codec_base->read_packet = read_packet_mpa; +- else if(decoder->id == CODEC_ID_AC3) ++ else if(decoder->id == AV_CODEC_ID_AC3) + { + codec_base->write_packet = write_packet_ac3; + codec_base->read_packet = read_packet_ac3; +diff -ruN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c +--- a/plugins/ffmpeg/lqt_ffmpeg.c 2012-02-15 20:48:30.000000000 +0100 ++++ b/plugins/ffmpeg/lqt_ffmpeg.c 2020-02-09 19:07:17.929831925 +0100 +@@ -386,7 +386,7 @@ + struct CODECIDMAP codecidmap_v[] = + { + { +- .id = CODEC_ID_MPEG1VIDEO, ++ .id = AV_CODEC_ID_MPEG1VIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -397,7 +397,7 @@ + .wav_ids = { LQT_WAV_ID_NONE } + }, + { +- .id = CODEC_ID_MPEG4, ++ .id = AV_CODEC_ID_MPEG4, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -415,7 +415,7 @@ + .compression_id = LQT_COMPRESSION_MPEG4_ASP, + }, + { +- .id = CODEC_ID_MSMPEG4V1, ++ .id = AV_CODEC_ID_MSMPEG4V1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -426,7 +426,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MSMPEG4V2, ++ .id = AV_CODEC_ID_MSMPEG4V2, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -437,7 +437,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MSMPEG4V3, ++ .id = AV_CODEC_ID_MSMPEG4V3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -453,7 +453,7 @@ + .do_encode = 1, + }, + { +- .id = CODEC_ID_MSMPEG4V3, ++ .id = AV_CODEC_ID_MSMPEG4V3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -468,7 +468,7 @@ + }, + #if 0 + { +- .id = CODEC_ID_WMV1, ++ .id = AV_CODEC_ID_WMV1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -481,7 +481,7 @@ + }, + #endif + { +- .id = CODEC_ID_H263, ++ .id = AV_CODEC_ID_H263, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -493,7 +493,7 @@ + .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP, + }, + { +- .id = CODEC_ID_H263, ++ .id = AV_CODEC_ID_H263, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -508,7 +508,7 @@ + .do_encode = 1, + }, + { +- .id = CODEC_ID_H264, ++ .id = AV_CODEC_ID_H264, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -519,7 +519,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_H263P, ++ .id = AV_CODEC_ID_H263P, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -533,7 +533,7 @@ + .do_encode = 1, + }, + { +- .id = CODEC_ID_H263I, ++ .id = AV_CODEC_ID_H263I, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -544,7 +544,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_SVQ1, ++ .id = AV_CODEC_ID_SVQ1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -555,7 +555,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_SVQ3, ++ .id = AV_CODEC_ID_SVQ3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -566,7 +566,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MJPEG, ++ .id = AV_CODEC_ID_MJPEG, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -580,7 +580,7 @@ + .do_encode = 1, + }, + { +- .id = CODEC_ID_MJPEGB, ++ .id = AV_CODEC_ID_MJPEGB, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -594,7 +594,7 @@ + }, + #if LIBAVCODEC_BUILD >= 3346688 + { +- .id = CODEC_ID_TARGA, ++ .id = AV_CODEC_ID_TARGA, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -606,7 +606,7 @@ + #endif + #if LIBAVCODEC_BUILD >= 3347456 + { +- .id = CODEC_ID_TIFF, ++ .id = AV_CODEC_ID_TIFF, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -617,7 +617,7 @@ + }, + #endif + { +- .id = CODEC_ID_8BPS, ++ .id = AV_CODEC_ID_8BPS, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -627,7 +627,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_INDEO3, ++ .id = AV_CODEC_ID_INDEO3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -638,7 +638,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_RPZA, ++ .id = AV_CODEC_ID_RPZA, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -648,7 +648,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_SMC, ++ .id = AV_CODEC_ID_SMC, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -658,7 +658,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_CINEPAK, ++ .id = AV_CODEC_ID_CINEPAK, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -669,7 +669,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_CYUV, ++ .id = AV_CODEC_ID_CYUV, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -680,7 +680,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_QTRLE, ++ .id = AV_CODEC_ID_QTRLE, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -693,7 +693,7 @@ + .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE }, + }, + { +- .id = CODEC_ID_MSRLE, ++ .id = AV_CODEC_ID_MSRLE, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -703,7 +703,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -719,7 +719,7 @@ + .image_sizes = image_sizes_dv, + }, + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -735,7 +735,7 @@ + .image_sizes = image_sizes_dv, + }, + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -751,7 +751,7 @@ + }, + /* DVCPRO HD (decoding only for now) */ + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -772,7 +772,7 @@ + // .do_encode = 1 + }, + { +- .id = CODEC_ID_FFVHUFF, ++ .id = AV_CODEC_ID_FFVHUFF, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -785,7 +785,7 @@ + .do_encode = 1 + }, + { +- .id = CODEC_ID_FFV1, ++ .id = AV_CODEC_ID_FFV1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -801,7 +801,7 @@ + }, + #if LIBAVCODEC_BUILD >= 3352576 + { +- .id = CODEC_ID_DNXHD, ++ .id = AV_CODEC_ID_DNXHD, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -817,7 +817,7 @@ + }, + #endif + { +- .id = CODEC_ID_MPEG2VIDEO, ++ .id = AV_CODEC_ID_MPEG2VIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -839,7 +839,7 @@ + struct CODECIDMAP codecidmap_a[] = + { + { +- .id = CODEC_ID_MP3, ++ .id = AV_CODEC_ID_MP3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -851,7 +851,7 @@ + .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MP2, ++ .id = AV_CODEC_ID_MP2, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -866,7 +866,7 @@ + .compression_id = LQT_COMPRESSION_MP2, + }, + { +- .id = CODEC_ID_AC3, ++ .id = AV_CODEC_ID_AC3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -881,7 +881,7 @@ + .compression_id = LQT_COMPRESSION_AC3, + }, + { +- .id = CODEC_ID_QDM2, ++ .id = AV_CODEC_ID_QDM2, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -896,7 +896,7 @@ + #if 1 + /* Doesn't work as long as audio chunks are not split into VBR "Samples" */ + { +- .id = CODEC_ID_ALAC, ++ .id = AV_CODEC_ID_ALAC, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -909,7 +909,7 @@ + #if 1 + /* Sounds ugly */ + { +- .id = CODEC_ID_ADPCM_MS, ++ .id = AV_CODEC_ID_ADPCM_MS, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -922,7 +922,7 @@ + #if 1 + /* Sounds ugly */ + { +- .id = CODEC_ID_ADPCM_IMA_WAV, ++ .id = AV_CODEC_ID_ADPCM_IMA_WAV, + .index = -1, + .encoder = NULL, + .decoder = NULL, +diff -ruN a/plugins/ffmpeg/video.c b/plugins/ffmpeg/video.c +--- a/plugins/ffmpeg/video.c 2012-02-25 20:46:56.000000000 +0100 ++++ b/plugins/ffmpeg/video.c 2020-02-09 19:07:44.399580606 +0100 +@@ -400,7 +400,7 @@ + codec->reinterpret_pix_fmt = codec->avctx->pix_fmt; + + /* First we try codec-specific colormodel matching. */ +- if(codec->decoder->id == CODEC_ID_DNXHD) ++ if(codec->decoder->id == AV_CODEC_ID_DNXHD) + { + /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which + we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ +@@ -438,7 +438,7 @@ + quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv; + codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel); + +- if (codec->encoder->id == CODEC_ID_DNXHD) ++ if (codec->encoder->id == AV_CODEC_ID_DNXHD) + { + /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 + and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 +@@ -728,13 +728,13 @@ + + /* Set extradata: It's done differently for each codec */ + +- if(codec->decoder->id == CODEC_ID_SVQ3) ++ if(codec->decoder->id == AV_CODEC_ID_SVQ3) + { + extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4; + extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4; + + } +- else if(codec->decoder->id == CODEC_ID_H264) ++ else if(codec->decoder->id == AV_CODEC_ID_H264) + { + user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len); + +@@ -753,7 +753,7 @@ + } + + } +- else if(codec->decoder->id == CODEC_ID_MPEG4) ++ else if(codec->decoder->id == AV_CODEC_ID_MPEG4) + { + if(trak->mdia.minf.stbl.stsd.table[0].has_esds) + { +@@ -947,15 +947,15 @@ + } + #endif + } +- if(codec->decoder->id == CODEC_ID_DVVIDEO) ++ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO) + { + if(vtrack->stream_cmodel == BC_YUV420P) + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; + vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST; + vtrack->ci.id = LQT_COMPRESSION_DV; + } +- else if((codec->decoder->id == CODEC_ID_MPEG4) || +- (codec->decoder->id == CODEC_ID_H264)) ++ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) || ++ (codec->decoder->id == AV_CODEC_ID_H264)) + { + if(vtrack->stream_cmodel == BC_YUV420P) + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; +@@ -1299,13 +1299,13 @@ + { + if(vtrack->stream_cmodel == BC_YUV420P) + { +- if(codec->encoder->id == CODEC_ID_MPEG4) ++ if(codec->encoder->id == AV_CODEC_ID_MPEG4) + { + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; + /* enable interlaced encoding */ + vtrack->interlace_mode = LQT_INTERLACE_NONE; + } +- else if(codec->encoder->id == CODEC_ID_DVVIDEO) ++ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) + { + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; + } +@@ -1340,7 +1340,7 @@ + codec->avctx->sample_aspect_ratio.num = pixel_width; + codec->avctx->sample_aspect_ratio.den = pixel_height; + /* Use global headers for mp4v */ +- if(codec->encoder->id == CODEC_ID_MPEG4) ++ if(codec->encoder->id == AV_CODEC_ID_MPEG4) + { + if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) + { +@@ -1364,12 +1364,12 @@ + } + #endif + } +- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) && ++ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) && + !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4)) + { + strncpy(trak->strl->strh.fccHandler, "div3", 4); + } +- else if((codec->encoder->id == CODEC_ID_H263) && ++ else if((codec->encoder->id == AV_CODEC_ID_H263) && + (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP))) + { + uint8_t d263_data[] = +@@ -1383,7 +1383,7 @@ + strncpy(trak->mdia.minf.stbl.stsd.table[0].format, + "s263", 4); + } +- else if(codec->encoder->id == CODEC_ID_FFVHUFF) ++ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) + { + if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) + { +@@ -1391,7 +1391,7 @@ + codec->write_global_header = 1; + } + } +- else if(codec->encoder->id == CODEC_ID_QTRLE) ++ else if(codec->encoder->id == AV_CODEC_ID_QTRLE) + { + if(vtrack->stream_cmodel == BC_RGBA8888) + { +@@ -1402,11 +1402,11 @@ + vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; + } + } +- else if(codec->encoder->id == CODEC_ID_DVVIDEO) ++ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) + { + set_dv_fourcc(width, height, vtrack->stream_cmodel, trak); + } +- else if(codec->encoder->id == CODEC_ID_DNXHD) ++ else if(codec->encoder->id == AV_CODEC_ID_DNXHD) + { + if(vtrack->interlace_mode != LQT_INTERLACE_NONE) + { +@@ -1558,12 +1558,12 @@ + + #endif + +- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD) ++ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD) + setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded); + + if(bytes_encoded) + { +- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0)) ++ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0)) + { + /* Some codecs don't bother generating presentation timestamps. + FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */ +@@ -1590,13 +1590,13 @@ + + if(codec->write_global_header && !codec->global_header_written) + { +- if(codec->encoder->id == CODEC_ID_FFVHUFF) ++ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) + { + quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms, + "glbl", + codec->avctx->extradata, codec->avctx->extradata_size ); + } +- else if(codec->encoder->id == CODEC_ID_MPEG4) ++ else if(codec->encoder->id == AV_CODEC_ID_MPEG4) + { + int advanced = 0; + if(codec->avctx->max_b_frames || +@@ -1903,18 +1903,18 @@ + codec_base->encode_video = lqt_ffmpeg_encode_video; + codec_base->set_pass = set_pass_ffmpeg; + +- if(encoder->id == CODEC_ID_MPEG4) ++ if(encoder->id == AV_CODEC_ID_MPEG4) + { + codec_base->writes_compressed = writes_compressed_mpeg4; + codec_base->init_compressed = init_compressed_mpeg4; + codec_base->write_packet = write_packet_mpeg4; + } +- else if(encoder->id == CODEC_ID_MPEG2VIDEO) ++ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO) + { + codec_base->writes_compressed = writes_compressed_imx; + codec_base->init_compressed = init_compressed_imx; + } +- else if(encoder->id == CODEC_ID_DVVIDEO) ++ else if(encoder->id == AV_CODEC_ID_DVVIDEO) + { + codec_base->init_compressed = init_compressed_dv; + } +@@ -1922,7 +1922,7 @@ + } + if(decoder) + { +- if(decoder->id == CODEC_ID_H264) ++ if(decoder->id == AV_CODEC_ID_H264) + codec_base->read_packet = read_packet_h264; + codec_base->decode_video = lqt_ffmpeg_decode_video; + } diff --git a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg2.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg2.patch similarity index 100% rename from libraries/libquicktime/libquicktime-1.2.4-ffmpeg2.patch rename to libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg2.patch diff --git a/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg29.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg29.patch new file mode 100644 index 0000000000..96a323aa81 --- /dev/null +++ b/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg29.patch @@ -0,0 +1,287 @@ +Index: libquicktime-1.2.4/plugins/ffmpeg/video.c +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c ++++ libquicktime-1.2.4/plugins/ffmpeg/video.c +@@ -37,10 +37,10 @@ + #endif + + +-#ifdef PIX_FMT_YUV422P10 +-#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 ++#ifdef AV_PIX_FMT_YUV422P10 ++#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 + #else +-#define PIX_FMT_YUV422P10_OR_DUMMY -1234 ++#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 + #endif + + #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) +@@ -90,9 +90,9 @@ typedef struct + int imx_bitrate; + int imx_strip_vbi; + +- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while +- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ +- enum PixelFormat reinterpret_pix_fmt; ++ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while ++ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ ++ enum AVPixelFormat reinterpret_pix_fmt; + + int is_imx; + int y_offset; +@@ -137,42 +137,42 @@ typedef struct + + static const struct + { +- enum PixelFormat ffmpeg_id; ++ enum AVPixelFormat ffmpeg_id; + int lqt_id; + int exact; + } + colormodels[] = + { +- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) ++ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) + #if LIBAVUTIL_VERSION_INT < (50<<16) +- { PIX_FMT_YUV422, BC_YUV422, 1 }, ++ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, + #else +- { PIX_FMT_YUYV422, BC_YUV422, 1 }, ++ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, + #endif +- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... +- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... +- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) +- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) +- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) +- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) +-#ifdef PIX_FMT_YUV422P10 +- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 +-#endif +- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness +- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) +- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) +- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) ++ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... ++ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... ++ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) ++ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) ++ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) ++ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) ++#ifdef AV_PIX_FMT_YUV422P10 ++ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 ++#endif ++ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness ++ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) ++ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) ++ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) + #if LIBAVUTIL_VERSION_INT < (50<<16) +- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... ++ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... + #else +- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... ++ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... + #endif +- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 +- { PIX_FMT_GRAY8, BC_RGB888, 0 }, +- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white +- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black +- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette +- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) ++ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 ++ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, ++ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white ++ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black ++ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette ++ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) + }; + + static const struct +@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV + if (!codec->pix_fmts) + return 0; + +- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) ++ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) + { +- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) ++ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) + return 1; + } + + return 0; + } + +-static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) ++static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) + { + int i; + +@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f + if(colormodels[i].lqt_id == id) + return colormodels[i].ffmpeg_id; + } +- return PIX_FMT_NB; ++ return AV_PIX_FMT_NB; + } + +-static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) ++static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) + { + int i; + +@@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co + /* First we try codec-specific colormodel matching. */ + if(codec->decoder->id == AV_CODEC_ID_DNXHD) + { +- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which +- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ +- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) ++ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which ++ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ ++ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) + { +- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); ++ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); + *exact = 1; + if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) + { + vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; +- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; +- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except ++ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; ++ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except + // there is no such colormodel in FFMpeg. Fortunately, it's not a problem + // in this case, as reinterpret_pix_fmt is only used when *exact == 0. + } + else + { + vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; +- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; ++ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; + } + return; + } +@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co + + if (codec->encoder->id == AV_CODEC_ID_DNXHD) + { +- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 +- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 ++ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 ++ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 + (in fact, the latter doesn't even exist) */ +- codec->avctx->pix_fmt = PIX_FMT_YUV422P; ++ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; + if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) + { + if (lqt_tenbit_dnxhd_supported(codec->encoder)) +- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; ++ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; + } + } + } +@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co + /* From avcodec.h: */ + + /* +- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA ++ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA + * color is put together as: + * (A << 24) | (R << 16) | (G << 8) | B + * This is stored as BGRA on little endian CPU architectures and ARGB on +@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t + */ + + static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, +- AVFrame * in_frame, enum PixelFormat in_format, ++ AVFrame * in_frame, enum AVPixelFormat in_format, + unsigned char ** out_frame, int out_format, + int width, int height, int row_span, int row_span_uv) + { +@@ -547,9 +547,9 @@ static void convert_image_decode(quickti + * RGBA format like in ffmpeg?? + */ + #if LIBAVUTIL_VERSION_INT < (50<<16) +- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) ++ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) + #else +- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) ++ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) + #endif + { + convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); +@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick + if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) + return -1; + #endif +- codec->frame = avcodec_alloc_frame(); ++ codec->frame = av_frame_alloc(); + vtrack->stream_cmodel = LQT_COLORMODEL_NONE; + codec->initialized = 1; + } +@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick + #ifdef HAVE_LIBSWSCALE + + #if LIBAVUTIL_VERSION_INT < (50<<16) +- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && ++ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && + (vtrack->stream_cmodel == BC_RGBA8888))) + #else +- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && ++ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && + (vtrack->stream_cmodel == BC_RGBA8888))) + #endif + { +@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick + + if(!codec->initialized) + { +- codec->frame = avcodec_alloc_frame(); ++ codec->frame = av_frame_alloc(); + + /* time_base is 1/framerate for constant framerate */ + +@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick + if(vtrack->stream_cmodel == BC_RGBA8888) + { + /* Libquicktime doesn't natively support a color model equivalent +- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. ++ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. + So, we use BC_RGBA8888 and do ad hoc conversion below. */ +- codec->avctx->pix_fmt = PIX_FMT_ARGB; ++ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; + vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; + } + } +@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick + } + // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); + +- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) ++ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) + { + if(!codec->tmp_rows) + { +@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick + vtrack->stream_cmodel, + 0, 0, 0, codec->y_offset); + } +- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) ++ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) + { + convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, + codec->tmp_rows[0], codec->tmp_row_span, +Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c ++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c +@@ -1266,7 +1266,7 @@ static int lqt_ffmpeg_encode_audio(quick + pkt.data = codec->chunk_buffer; + pkt.size = codec->chunk_buffer_alloc; + +- avcodec_get_frame_defaults(&f); ++ av_frame_unref(&f); + f.nb_samples = codec->avctx->frame_size; + + avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, diff --git a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg4.patch similarity index 100% rename from libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch rename to libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg4.patch diff --git a/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg5.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg5.patch new file mode 100644 index 0000000000..d340f084af --- /dev/null +++ b/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg5.patch @@ -0,0 +1,342 @@ +--- a/plugins/ffmpeg/audio.c ++++ b/plugins/ffmpeg/audio.c +@@ -423,8 +423,8 @@ static int a52_header_read(a52_header * + typedef struct + { + AVCodecContext * avctx; +- AVCodec * encoder; +- AVCodec * decoder; ++ AVCodec const * encoder; ++ AVCodec const * decoder; + + int initialized; + +@@ -512,7 +512,6 @@ static int decode_chunk_vbr(quicktime_t + + #if DECODE_AUDIO4 + AVFrame f; +- int got_frame; + #endif + + chunk_packets = lqt_audio_num_vbr_packets(file, track, track_map->cur_chunk, &num_samples); +@@ -548,13 +547,14 @@ static int decode_chunk_vbr(quicktime_t + codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE; + + #if DECODE_AUDIO4 +- frame_bytes = avcodec_decode_audio4(codec->avctx, &f, +- &got_frame, &codec->pkt); +- if(frame_bytes < 0) ++ if(avcodec_send_packet(codec->avctx, &codec->pkt) < 0 && ++ avcodec_receive_frame(codec->avctx, &f) < 0) + { + lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio4 error"); + break; + } ++ frame_bytes = codec->pkt.size; ++ + bytes_decoded = f.nb_samples * 2 * track_map->channels; + memcpy(&codec->sample_buffer[track_map->channels * + (codec->sample_buffer_end - +@@ -615,7 +615,6 @@ static int decode_chunk(quicktime_t * fi + + #if DECODE_AUDIO4 + AVFrame f; +- int got_frame; + #endif + + /* Read chunk */ +@@ -764,14 +763,14 @@ static int decode_chunk(quicktime_t * fi + codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE; + + #if DECODE_AUDIO4 +- +- frame_bytes = avcodec_decode_audio4(codec->avctx, &f, +- &got_frame, &codec->pkt); +- if(frame_bytes < 0) ++ if(avcodec_send_packet(codec->avctx, &codec->pkt) < 0 || ++ avcodec_receive_frame(codec->avctx, &f) < 0) + { + lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio4 error"); + break; + } ++ frame_bytes = codec->pkt.size; ++ + bytes_decoded = f.nb_samples * 2 * track_map->channels; + memcpy(&codec->sample_buffer[track_map->channels * + (codec->sample_buffer_end - +@@ -1198,7 +1197,6 @@ static int lqt_ffmpeg_encode_audio(quick + #if ENCODE_AUDIO2 + AVFrame f; + AVPacket pkt; +- int got_packet; + #endif + + if(!codec->initialized) +@@ -1274,15 +1272,11 @@ static int lqt_ffmpeg_encode_audio(quick + codec->avctx->frame_size * channels * 2, + 1); + +- if(avcodec_encode_audio2(codec->avctx, &pkt, +- &f, &got_packet) < 0) ++ if(avcodec_send_frame(codec->avctx, &f) < 0 || ++ avcodec_receive_packet(codec->avctx, &pkt) < 0) + return 0; + +- if(got_packet && pkt.size) +- frame_bytes = pkt.size; +- else +- frame_bytes = 0; +- ++ frame_bytes = pkt.size; + #else + frame_bytes = avcodec_encode_audio(codec->avctx, codec->chunk_buffer, + codec->chunk_buffer_alloc, +@@ -1474,8 +1468,9 @@ static int read_packet_ac3(quicktime_t * + } + + void quicktime_init_audio_codec_ffmpeg(quicktime_codec_t * codec_base, +- quicktime_audio_map_t *atrack, AVCodec *encoder, +- AVCodec *decoder) ++ quicktime_audio_map_t *atrack, ++ const AVCodec *encoder, ++ const AVCodec *decoder) + { + quicktime_ffmpeg_audio_codec_t *codec; + +--- a/plugins/ffmpeg/ffmpeg.h ++++ b/plugins/ffmpeg/ffmpeg.h +@@ -30,10 +30,12 @@ + + void quicktime_init_video_codec_ffmpeg(quicktime_codec_t * codec, + quicktime_video_map_t *vtrack, +- AVCodec *encoder, AVCodec *decoder); ++ const AVCodec *encoder, ++ const AVCodec *decoder); + void quicktime_init_audio_codec_ffmpeg(quicktime_codec_t * codec, + quicktime_audio_map_t *vtrack, +- AVCodec *encoder, AVCodec *decoder); ++ const AVCodec *encoder, ++ const AVCodec *decoder); + + void lqt_ffmpeg_set_parameter(AVCodecContext * ctx, + #if LIBAVCODEC_VERSION_MAJOR >= 54 +--- a/plugins/ffmpeg/lqt_ffmpeg.c ++++ b/plugins/ffmpeg/lqt_ffmpeg.c +@@ -315,8 +315,8 @@ struct CODECIDMAP + { + int id; + int index; +- AVCodec *encoder; +- AVCodec *decoder; ++ AVCodec const *encoder; ++ AVCodec const *decoder; + lqt_parameter_info_static_t * encode_parameters; + lqt_parameter_info_static_t * decode_parameters; + lqt_image_size_static_t * image_sizes; +@@ -947,7 +947,9 @@ static void ffmpeg_map_init(void) + return; + } + ++#if LIBAVCODEC_VERSION_MAJOR < 59 + avcodec_register_all(); ++#endif + // avcodec_init(); + ffmpeg_num_video_codecs = 0; + ffmpeg_num_audio_codecs = 0; +--- a/plugins/ffmpeg/params.c ++++ b/plugins/ffmpeg/params.c +@@ -124,12 +124,14 @@ typedef struct + } + + ++#if LIBAVCODEC_VERSION_MAJOR < 59 + enum_t prediction_method[] = + { + { "Left", FF_PRED_LEFT }, + { "Plane", FF_PRED_PLANE }, + { "Median", FF_PRED_MEDIAN } + }; ++#endif + + enum_t compare_func[] = + { +@@ -193,7 +195,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_INT("ff_max_qdiff",max_qdiff); + PARAM_INT("ff_max_b_frames",max_b_frames); + PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); ++#if LIBAVCODEC_VERSION_MAJOR < 59 + PARAM_INT("ff_b_frame_strategy",b_frame_strategy); ++#endif + + #if LIBAVCODEC_VERSION_MAJOR >= 55 + PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); +@@ -216,7 +220,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking); + PARAM_FLOAT("ff_p_masking",p_masking); + PARAM_FLOAT("ff_dark_masking",dark_masking); ++#if LIBAVCODEC_VERSION_MAJOR < 59 + PARAM_ENUM("ff_prediction_method",prediction_method,prediction_method); ++#endif + PARAM_ENUM("ff_me_cmp",me_cmp,compare_func); + PARAM_CMP_CHROMA("ff_me_cmp_chroma",me_cmp); + PARAM_ENUM("ff_me_sub_cmp",me_sub_cmp,compare_func); +@@ -227,17 +233,23 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_CMP_CHROMA("ff_ildct_cmp_chroma",ildct_cmp); + PARAM_INT("ff_dia_size",dia_size); + PARAM_INT("ff_last_predictor_count",last_predictor_count); ++#if LIBAVCODEC_VERSION_MAJOR < 59 + PARAM_INT("ff_pre_me",pre_me); ++#endif + PARAM_ENUM("ff_me_pre_cmp",me_pre_cmp,compare_func); + PARAM_CMP_CHROMA("ff_pre_me_cmp_chroma",me_pre_cmp); + PARAM_INT("ff_pre_dia_size",pre_dia_size); + PARAM_INT("ff_me_subpel_quality",me_subpel_quality); + PARAM_INT("ff_me_range",me_range); + PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision); ++#if LIBAVCODEC_VERSION_MAJOR < 59 + PARAM_INT("ff_scenechange_threshold",scenechange_threshold); ++#endif + PARAM_DICT_INT("ff_lmin", "lmin"); + PARAM_DICT_INT("ff_lmax", "lmax"); ++#if LIBAVCODEC_VERSION_MAJOR < 59 + PARAM_INT("ff_noise_reduction",noise_reduction); ++#endif + PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); + + #if LIBAVCODEC_VERSION_MAJOR >= 55 +@@ -253,9 +265,13 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_DICT_INT("ff_border_masking","border_mask"); + PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin); + PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax); ++#if LIBAVCODEC_VERSION_MAJOR < 59 + PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation); ++#endif + PARAM_INT("ff_bidir_refine",bidir_refine); ++#if LIBAVCODEC_VERSION_MAJOR < 59 + PARAM_INT("ff_brd_scale",brd_scale); ++#endif + PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE); + PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV); + PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL); +--- a/plugins/ffmpeg/video.c ++++ b/plugins/ffmpeg/video.c +@@ -61,8 +61,8 @@ enum AvidYuvRange + typedef struct + { + AVCodecContext * avctx; +- AVCodec * encoder; +- AVCodec * decoder; ++ AVCodec const * encoder; ++ AVCodec const * decoder; + int initialized; + + int decoding_delay; +@@ -878,10 +878,12 @@ static int lqt_ffmpeg_decode_video(quick + } + #endif + +- if(avcodec_decode_video2(codec->avctx, +- codec->frame, +- &got_pic, +- &codec->pkt) < 0) ++ if(avcodec_send_packet(codec->avctx, &codec->pkt) == 0 && ++ avcodec_receive_frame(codec->avctx, codec->frame) == 0) ++ { ++ got_pic = 1; ++ } ++ else + { + lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "Skipping corrupted frame"); + continue; +@@ -1062,10 +1064,8 @@ static void resync_ffmpeg(quicktime_t *f + #if LIBAVCODEC_BUILD >= ((52<<16)+(26<<8)+0) + codec->pkt.data = codec->buffer; + codec->pkt.size = buffer_size; +- avcodec_decode_video2(codec->avctx, +- codec->frame, +- &got_pic, +- &codec->pkt); ++ got_pic = (avcodec_send_packet(codec->avctx, &codec->pkt) == 0 && ++ avcodec_receive_frame(codec->avctx, codec->frame) == 0); + #else + avcodec_decode_video(codec->avctx, + codec->frame, +@@ -1139,7 +1139,9 @@ static int init_imx_encoder(quicktime_t + codec->avctx->intra_dc_precision = 2; + codec->avctx->qmin = 1; + codec->avctx->qmax = 3; ++#if (LIBAVCODEC_VERSION_MAJOR < 59) + codec->avctx->rtp_payload_size = 1; // ?? ++#endif + av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0); + codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY; + +@@ -1290,7 +1292,6 @@ static int lqt_ffmpeg_encode_video(quick + int stats_len; + #if ENCODE_VIDEO2 + AVPacket pkt; +- int got_packet; + #endif + int64_t pts; + int kf; +@@ -1530,16 +1531,12 @@ static int lqt_ffmpeg_encode_video(quick + #if ENCODE_VIDEO2 // New + av_init_packet(&pkt); + pkt.data = codec->buffer; +- pkt.size = codec->buffer_alloc; ++ pkt.size = bytes_encoded = codec->buffer_alloc; + +- if(avcodec_encode_video2(codec->avctx, &pkt, codec->frame, &got_packet) < 0) ++ if(avcodec_send_frame(codec->avctx, codec->frame) < 0 || ++ avcodec_receive_packet(codec->avctx, &pkt) < 0) + return -1; + +- if(got_packet) +- bytes_encoded = pkt.size; +- else +- bytes_encoded = 0; +- + pts = pkt.pts; + kf = !!(pkt.flags & AV_PKT_FLAG_KEY); + +@@ -1621,7 +1618,6 @@ static int flush(quicktime_t *file, int + + #if ENCODE_VIDEO2 + AVPacket pkt; +- int got_packet; + #endif + + /* Do nothing if we didn't encode anything yet */ +@@ -1631,18 +1627,13 @@ static int flush(quicktime_t *file, int + #if ENCODE_VIDEO2 + av_init_packet(&pkt); + pkt.data = codec->buffer; +- pkt.size = codec->buffer_alloc; ++ pkt.size = bytes_encoded = codec->buffer_alloc; + +- if(avcodec_encode_video2(codec->avctx, &pkt, (AVFrame*)0, &got_packet) < 0) ++ if(avcodec_send_frame(codec->avctx, NULL) < 0 || ++ avcodec_receive_packet(codec->avctx, &pkt) < 0) + return -1; + +- if(got_packet) +- bytes_encoded = pkt.size; +- else +- return 0; +- + pts = pkt.pts; +- + kf = !!(pkt.flags & AV_PKT_FLAG_KEY); + + #else +@@ -1872,8 +1863,8 @@ static int init_compressed_dv(quicktime_ + + void quicktime_init_video_codec_ffmpeg(quicktime_codec_t * codec_base, + quicktime_video_map_t *vtrack, +- AVCodec *encoder, +- AVCodec *decoder) ++ const AVCodec *encoder, ++ const AVCodec *decoder) + { + quicktime_ffmpeg_video_codec_t *codec; + char *compressor; diff --git a/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg7.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg7.patch new file mode 100644 index 0000000000..8a87ee6e88 --- /dev/null +++ b/libraries/libquicktime/patches/libquicktime-1.2.4-ffmpeg7.patch @@ -0,0 +1,38 @@ +--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c 2024-07-09 12:18:11.919376601 +0200 ++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c 2024-07-09 12:10:53.297276614 +0200 +@@ -971,7 +971,11 @@ + if(!codec->initialized) + { + /* Set some mandatory variables */ ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ codec->avctx->ch_layout.nb_channels = quicktime_track_channels(file, track); ++#else + codec->avctx->channels = quicktime_track_channels(file, track); ++#endif + codec->avctx->sample_rate = quicktime_sample_rate(file, track); + + if(track_map->track->mdia.minf.stbl.stsd.table[0].version == 1) +@@ -1202,7 +1206,11 @@ + if(!codec->initialized) + { + codec->avctx->sample_rate = track_map->samplerate; ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ codec->avctx->ch_layout.nb_channels = channels; ++#else + codec->avctx->channels = channels; ++#endif + + codec->avctx->codec_id = codec->encoder->id; + codec->avctx->codec_type = codec->encoder->type; +@@ -1229,7 +1237,11 @@ + /* One frame is: bitrate * frame_samples / (samplerate * 8) + 1024 */ + codec->chunk_buffer_alloc = ( codec->avctx->frame_size + * sizeof( int16_t ) ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ * codec->avctx->ch_layout.nb_channels); ++#else + * codec->avctx->channels); ++#endif + codec->chunk_buffer = malloc(codec->chunk_buffer_alloc); + + if(trak->strl) diff --git a/libraries/libquicktime/patches/libquicktime-1.2.4-libavutil.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-libavutil.patch new file mode 100644 index 0000000000..99a4d39e50 --- /dev/null +++ b/libraries/libquicktime/patches/libquicktime-1.2.4-libavutil.patch @@ -0,0 +1,12 @@ +Index: libquicktime-1.2.4/plugins/ffmpeg/ffmpeg.h +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/ffmpeg.h ++++ libquicktime-1.2.4/plugins/ffmpeg/ffmpeg.h +@@ -27,6 +27,7 @@ + + #include + #include AVCODEC_HEADER ++#include + + void quicktime_init_video_codec_ffmpeg(quicktime_codec_t * codec, + quicktime_video_map_t *vtrack, diff --git a/libraries/libquicktime/patches/libquicktime-1.2.4-qtpng.patch b/libraries/libquicktime/patches/libquicktime-1.2.4-qtpng.patch new file mode 100644 index 0000000000..3980eeeddf --- /dev/null +++ b/libraries/libquicktime/patches/libquicktime-1.2.4-qtpng.patch @@ -0,0 +1,11 @@ + +--- libquicktime-1.2.4.orig/plugins/png/qtpng.c 2011-01-07 15:40:46.000000000 +0100 ++++ libquicktime-1.2.4/plugins/png/qtpng.c 2024-06-19 11:04:51.460483842 +0200 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include "qtpng.h" + + typedef struct diff --git a/libraries/libreplaygain/libreplaygain.SlackBuild b/libraries/libreplaygain/libreplaygain.SlackBuild index c4ba651d69..cbd44a5674 100644 --- a/libraries/libreplaygain/libreplaygain.SlackBuild +++ b/libraries/libreplaygain/libreplaygain.SlackBuild @@ -69,6 +69,7 @@ cmake \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DLIB_SUFFIX=${LIBDIRSUFFIX} . make diff --git a/libraries/libsbsms/libsbsms.SlackBuild b/libraries/libsbsms/libsbsms.SlackBuild index 3f2edb8f4e..a748b276d9 100644 --- a/libraries/libsbsms/libsbsms.SlackBuild +++ b/libraries/libsbsms/libsbsms.SlackBuild @@ -85,6 +85,7 @@ cd build cmake \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/libsmi/gcc-14.patch b/libraries/libsmi/gcc-14.patch new file mode 100644 index 0000000000..14caaa70ac --- /dev/null +++ b/libraries/libsmi/gcc-14.patch @@ -0,0 +1,45 @@ +diff -upr libsmi-0.5.0.orig/lib/error.h libsmi-0.5.0/lib/error.h +--- libsmi-0.5.0.orig/lib/error.h 2024-08-28 19:29:57.784814222 +0200 ++++ libsmi-0.5.0/lib/error.h 2024-08-28 19:30:37.251483792 +0200 +@@ -14,6 +14,7 @@ + #ifndef _ERROR_H + #define _ERROR_H + ++#include "smi-check.h" + #include "smi-data.h" + #include "errormacros.h" /* list of error macros generated from error.c */ + +diff -upr libsmi-0.5.0.orig/lib/parser-yang.c libsmi-0.5.0/lib/parser-yang.c +--- libsmi-0.5.0.orig/lib/parser-yang.c 2024-08-28 19:29:57.791480888 +0200 ++++ libsmi-0.5.0/lib/parser-yang.c 2024-08-28 19:30:44.448150987 +0200 +@@ -92,6 +92,7 @@ + #endif + + #include "yang.h" ++#include "yang-check.h" + #include "yang-data.h" + #include "parser-yang.h" + #include "scanner-yang.h" +diff -upr libsmi-0.5.0.orig/lib/parser-yang.y libsmi-0.5.0/lib/parser-yang.y +--- libsmi-0.5.0.orig/lib/parser-yang.y 2024-08-28 19:29:57.791480888 +0200 ++++ libsmi-0.5.0/lib/parser-yang.y 2024-08-28 19:30:44.451484321 +0200 +@@ -35,6 +35,7 @@ + #endif + + #include "yang.h" ++#include "yang-check.h" + #include "yang-data.h" + #include "parser-yang.h" + #include "scanner-yang.h" +diff -upr libsmi-0.5.0.orig/lib/yang-data.h libsmi-0.5.0/lib/yang-data.h +--- libsmi-0.5.0.orig/lib/yang-data.h 2024-08-28 19:29:57.801480888 +0200 ++++ libsmi-0.5.0/lib/yang-data.h 2024-08-28 19:30:44.451484321 +0200 +@@ -164,6 +164,8 @@ int removeYangNode(_YangNode* target, _Y + + _YangModuleInfo *createModuleInfo(_YangNode *modulePtr); + ++void createIdentifierRef(_YangNode *node, char* prefix, char* ident); ++ + void createTypeInfo(_YangNode *node); + + _YangNode *findYangModuleByName(const char *modulename, char* revision); diff --git a/libraries/libsmi/gcc-15.patch b/libraries/libsmi/gcc-15.patch new file mode 100644 index 0000000000..155474de60 --- /dev/null +++ b/libraries/libsmi/gcc-15.patch @@ -0,0 +1,36 @@ +diff -Naur libsmi-0.5.0.orig/lib/parser-smi.h libsmi-0.5.0/lib/parser-smi.h +--- libsmi-0.5.0.orig/lib/parser-smi.h 2013-06-04 14:34:00.000000000 +0200 ++++ libsmi-0.5.0/lib/parser-smi.h 2025-07-03 06:48:23.823380000 +0200 +@@ -24,7 +24,7 @@ + + + +-extern int smiparse(); ++extern int smiparse(struct Parser *parserPtr); + + + +diff -Naur libsmi-0.5.0.orig/lib/parser-yang.h libsmi-0.5.0/lib/parser-yang.h +--- libsmi-0.5.0.orig/lib/parser-yang.h 2013-06-04 14:34:00.000000000 +0200 ++++ libsmi-0.5.0/lib/parser-yang.h 2025-07-03 06:48:54.799380000 +0200 +@@ -13,7 +13,7 @@ + + + +-extern int yangparse(); ++extern int yangparse(struct Parser *parserPtr); + + + +diff -Naur libsmi-0.5.0.orig/lib/smi-data.c libsmi-0.5.0/lib/smi-data.c +--- libsmi-0.5.0.orig/lib/smi-data.c 2013-06-04 14:34:00.000000000 +0200 ++++ libsmi-0.5.0/lib/smi-data.c 2025-07-03 06:49:46.413380000 +0200 +@@ -39,7 +39,7 @@ + + #ifdef BACKEND_SMI + #include "scanner-smi.h" +-extern int smiparse(); ++extern int smiparse(struct Parser *parserPtr); + #endif + + #ifdef BACKEND_SMING diff --git a/libraries/libsmi/libsmi.SlackBuild b/libraries/libsmi/libsmi.SlackBuild index ae2b07956f..43585efb9e 100644 --- a/libraries/libsmi/libsmi.SlackBuild +++ b/libraries/libsmi/libsmi.SlackBuild @@ -7,8 +7,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libsmi -VERSION=${VERSION:-0.4.8} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.5.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -20,9 +20,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -61,6 +58,9 @@ 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-14.patch +patch -p1 < $CWD/gcc-15.patch + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/libsmi/libsmi.info b/libraries/libsmi/libsmi.info index 166942ce49..77a28b0916 100644 --- a/libraries/libsmi/libsmi.info +++ b/libraries/libsmi/libsmi.info @@ -1,8 +1,8 @@ PRGNAM="libsmi" -VERSION="0.4.8" +VERSION="0.5.0" HOMEPAGE="http://www.ibr.cs.tu-bs.de/projects/libsmi/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/libsmi-0.4.8.tar.gz" -MD5SUM="760b6b1070738158708649ed2c63425e" +DOWNLOAD="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/libsmi-0.5.0.tar.gz" +MD5SUM="4bf47483c06c9f07d1b10fbc74eddf11" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libsoup3/README b/libraries/libsoup3/README deleted file mode 100644 index dbdd7128d3..0000000000 --- a/libraries/libsoup3/README +++ /dev/null @@ -1,6 +0,0 @@ -Soup is an HTTP client/server library implementation in C. It uses -GObjects and the glib main loop to integrate well with GTK+ -applications, and has a synchronous API suitable for use in threaded -applications. - -NOTE: This package can co-exist with libsoup package in Slackware. diff --git a/libraries/libsoup3/libsoup3.SlackBuild b/libraries/libsoup3/libsoup3.SlackBuild deleted file mode 100644 index 08c115bf59..0000000000 --- a/libraries/libsoup3/libsoup3.SlackBuild +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# Slackware build script for libsoup3 - -# Copyright 2022-2025 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libsoup3 -SRCNAM=libsoup -VERSION=${VERSION:-3.6.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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.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 {} \+ - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - -Dtests=FALSE \ - -Dsysprof="disabled" \ - -Dstrip=true \ - -Ddocs="disabled" \ - --sysconfdir=/etc - ninja - DESTDIR=$PKG ninja install -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING NEWS README docs 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 diff --git a/libraries/libsoup3/libsoup3.info b/libraries/libsoup3/libsoup3.info deleted file mode 100644 index fc3d91020c..0000000000 --- a/libraries/libsoup3/libsoup3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libsoup3" -VERSION="3.6.5" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libsoup" -DOWNLOAD="https://gitlab.gnome.org/GNOME/libsoup/-/archive/3.6.5/libsoup-3.6.5.tar.bz2" -MD5SUM="343595b48c2227b9ecd557b6c46bbb6d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/libsoup3/slack-desc b/libraries/libsoup3/slack-desc deleted file mode 100644 index 2567a528e2..0000000000 --- a/libraries/libsoup3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libsoup3: libsoup3 (an HTTP client/server library) -libsoup3: -libsoup3: Soup is an HTTP client/server library implementation in C. It uses -libsoup3: GObjects and the glib main loop to integrate well with GTK+ -libsoup3: applications, and has a synchronous API suitable for use in threaded -libsoup3: applications. -libsoup3: -libsoup3: -libsoup3: -libsoup3: -libsoup3: diff --git a/libraries/libtraceevent/README b/libraries/libtraceevent/README deleted file mode 100644 index b983006936..0000000000 --- a/libraries/libtraceevent/README +++ /dev/null @@ -1,3 +0,0 @@ -The libtraceevent library provides APIs to access kernel -tracepoint events, located in the tracefs file system under the -events directory. diff --git a/libraries/libtraceevent/libtraceevent.SlackBuild b/libraries/libtraceevent/libtraceevent.SlackBuild deleted file mode 100644 index 85f46ac2e8..0000000000 --- a/libraries/libtraceevent/libtraceevent.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for libtraceevent - -# Copyright 2023 Julian Grinblat -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libtraceevent -VERSION=${VERSION:-1.7.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -make -make install prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} mandir=/usr/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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -ar README LICENSES Documentation samples $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libtraceevent/libtraceevent.info b/libraries/libtraceevent/libtraceevent.info deleted file mode 100644 index 9b5fa798ff..0000000000 --- a/libraries/libtraceevent/libtraceevent.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libtraceevent" -VERSION="1.7.2" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/about" -DOWNLOAD="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-1.7.2.tar.gz" -MD5SUM="5a8cd771ab709e7a7eb793555c7e570f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Julian Grinblat" -EMAIL="julian@dotcore.co.il" diff --git a/libraries/libtraceevent/slack-desc b/libraries/libtraceevent/slack-desc deleted file mode 100644 index bf436a7db8..0000000000 --- a/libraries/libtraceevent/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libtraceevent: libtraceevent (Linux kernel trace event library) -libtraceevent: -libtraceevent: The libtraceevent(3) library provides APIs to access kernel -libtraceevent: tracepoint events, located in the tracefs file system under the -libtraceevent: events directory. -libtraceevent: -libtraceevent: -libtraceevent: -libtraceevent: -libtraceevent: -libtraceevent: diff --git a/libraries/libtracefs/README b/libraries/libtracefs/README deleted file mode 100644 index 86a911693b..0000000000 --- a/libraries/libtracefs/README +++ /dev/null @@ -1,2 +0,0 @@ -The libtracefs library provides APIs to access kernel -trace file system. diff --git a/libraries/libtracefs/libtracefs.SlackBuild b/libraries/libtracefs/libtracefs.SlackBuild deleted file mode 100644 index cbc05eeb73..0000000000 --- a/libraries/libtracefs/libtracefs.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for libtracefs - -# Copyright 2023 Nicholas Hubbard -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libtracefs -VERSION=${VERSION:-1.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -make -make install prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} mandir=/usr/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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -ar README LICENSES Documentation samples $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libtracefs/libtracefs.info b/libraries/libtracefs/libtracefs.info deleted file mode 100644 index c03062b9a6..0000000000 --- a/libraries/libtracefs/libtracefs.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libtracefs" -VERSION="1.7.0" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/about" -DOWNLOAD="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-1.7.0.tar.gz" -MD5SUM="f425ce100c05de04aa1c72b487507214" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libtraceevent" -MAINTAINER="Nicholas Hubbard" -EMAIL="nicholashubbard@posteo.net" diff --git a/libraries/libtracefs/slack-desc b/libraries/libtracefs/slack-desc deleted file mode 100644 index 668f67e619..0000000000 --- a/libraries/libtracefs/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libtracefs: libtracefs (Linux kernel trace file system library) -libtracefs: -libtracefs: The libtracefs(3) library provides APIs to access kernel trace file -libtracefs: system. -libtracefs: -libtracefs: -libtracefs: -libtracefs: -libtracefs: -libtracefs: -libtracefs: diff --git a/libraries/libunibreak/README b/libraries/libunibreak/README deleted file mode 100644 index 597ba98bcb..0000000000 --- a/libraries/libunibreak/README +++ /dev/null @@ -1,9 +0,0 @@ -libunibreak (a line breaking library) - -Libunibreak is an implementation of the line breaking and word -breaking algorithms as described in Unicode Standard Annex 14 and -Unicode Standard Annex 29. - -It is designed to be used in a generic text renderer. FBReader is one -real-world example, and the Enlightenment Foundation Libraries are -another. diff --git a/libraries/libunibreak/libunibreak.SlackBuild b/libraries/libunibreak/libunibreak.SlackBuild deleted file mode 100644 index 9251cefd1e..0000000000 --- a/libraries/libunibreak/libunibreak.SlackBuild +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -# Slackware build script for libunibreak -# Maintained as of version 3.0 by slackmart -# Now maintained by B. Watson -# Original version had no license; now licensed under the WTFPL. See -# http://www.wtfpl.net/txt/copying/ for details. - -# 20240315 bkw: update for v6.1 -# 20230111 bkw: update for v5.1 -# 20211003 bkw: -# - take over maintenance -# - update for v4.3 -# - add HTML docs to package - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libunibreak -VERSION=${VERSION:-6.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ ---prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS* LICEN* NEWS README* 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 diff --git a/libraries/libunibreak/libunibreak.info b/libraries/libunibreak/libunibreak.info deleted file mode 100644 index cfdbef9981..0000000000 --- a/libraries/libunibreak/libunibreak.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libunibreak" -VERSION="6.1" -HOMEPAGE="https://github.com/adah1972/libunibreak/" -DOWNLOAD="https://github.com/adah1972/libunibreak/releases/download/libunibreak_6_1/libunibreak-6.1.tar.gz" -MD5SUM="8df410d010e03de1a339a400a920335e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/libraries/libunibreak/slack-desc b/libraries/libunibreak/slack-desc deleted file mode 100644 index dfb36c5f36..0000000000 --- a/libraries/libunibreak/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libunibreak: libunibreak (a line breaking library) -libunibreak: -libunibreak: Libunibreak is an implementation of the line breaking and word -libunibreak: breaking algorithms as described in Unicode Standard Annex 14 and -libunibreak: Unicode Standard Annex 29. -libunibreak: -libunibreak: It is designed to be used in a generic text renderer. FBReader is -libunibreak: one real-world example, and the Enlightenment Foundation Libraries -libunibreak: are another. -libunibreak: -libunibreak: diff --git a/libraries/libunicap/libunicap.SlackBuild b/libraries/libunicap/libunicap.SlackBuild index cd365f1adf..d9b730847a 100644 --- a/libraries/libunicap/libunicap.SlackBuild +++ b/libraries/libunicap/libunicap.SlackBuild @@ -68,6 +68,8 @@ patch -p1 < $CWD/gcc10.patch sed -i "s|linux\/videodev\.|libv4l1-videodev.|" \ cpi/v4l/v4l.c cpi/v4l2cpi/uvcvideo.h +sed -i "s|charset=|charset=UTF-8|" po/de.po + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libvdpau-va-gl/libvdpau-va-gl.SlackBuild b/libraries/libvdpau-va-gl/libvdpau-va-gl.SlackBuild index 36c2adebf9..9e676ebbbf 100644 --- a/libraries/libvdpau-va-gl/libvdpau-va-gl.SlackBuild +++ b/libraries/libvdpau-va-gl/libvdpau-va-gl.SlackBuild @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvdpau-va-gl -VERSION=${VERSION:-0.4.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20250518_a845e87} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,7 +72,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 . chmod -R u+w,go-w,a+rX-st . @@ -83,7 +83,6 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release \ .. make diff --git a/libraries/libvdpau-va-gl/libvdpau-va-gl.info b/libraries/libvdpau-va-gl/libvdpau-va-gl.info index 799dcf36e6..f0223c259d 100644 --- a/libraries/libvdpau-va-gl/libvdpau-va-gl.info +++ b/libraries/libvdpau-va-gl/libvdpau-va-gl.info @@ -1,8 +1,8 @@ PRGNAM="libvdpau-va-gl" -VERSION="0.4.2" +VERSION="20250518_a845e87" HOMEPAGE="https://github.com/i-rinat/libvdpau-va-gl" -DOWNLOAD="https://github.com/i-rinat/libvdpau-va-gl/archive/v0.4.2/libvdpau-va-gl-0.4.2.tar.gz" -MD5SUM="8db21dcfd5cd14c6ec51b992e20369dc" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/libvdpau-va-gl-20250518_a845e87.tar.xz" +MD5SUM="7c05ef28f808b7b398f586f01486d641" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libvirt-python/libvirt-python.SlackBuild b/libraries/libvirt-python/libvirt-python.SlackBuild index f3d7d25df5..c9e9ede9b8 100644 --- a/libraries/libvirt-python/libvirt-python.SlackBuild +++ b/libraries/libvirt-python/libvirt-python.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libvirt-python -# Copyright 2013-2024 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013-2025 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvirt-python -VERSION=${VERSION:-10.10.0} +VERSION=${VERSION:-11.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libvirt-python/libvirt-python.info b/libraries/libvirt-python/libvirt-python.info index 741d943561..6ed3b16c36 100644 --- a/libraries/libvirt-python/libvirt-python.info +++ b/libraries/libvirt-python/libvirt-python.info @@ -1,8 +1,8 @@ PRGNAM="libvirt-python" -VERSION="10.10.0" +VERSION="11.6.0" HOMEPAGE="https://libvirt.org" -DOWNLOAD="https://download.libvirt.org/python/libvirt-python-10.10.0.tar.gz" -MD5SUM="004550e6c71f88bd56480590f54ed048" +DOWNLOAD="https://download.libvirt.org/python/libvirt-python-11.6.0.tar.gz" +MD5SUM="8bb6db42fa5991c43ea786888ecc000a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libvirt" diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index 27a9e7b253..1c2e54b81c 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -10,7 +10,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvirt -VERSION=${VERSION:-10.10.0} +VERSION=${VERSION:-11.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index 7b65038bac..0a8617aa41 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,8 +1,8 @@ PRGNAM="libvirt" -VERSION="10.10.0" +VERSION="11.6.0" HOMEPAGE="http://libvirt.org" -DOWNLOAD="https://download.libvirt.org/libvirt-10.10.0.tar.xz" -MD5SUM="1ac7a0bce2d4584d293bd1d157f7c148" +DOWNLOAD="https://download.libvirt.org/libvirt-11.6.0.tar.xz" +MD5SUM="0417e6b4332e42676a689bf8e0294848" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yajl" diff --git a/libraries/libwpe/libwpe.SlackBuild b/libraries/libwpe/libwpe.SlackBuild index d137cf51f3..fb82219283 100644 --- a/libraries/libwpe/libwpe.SlackBuild +++ b/libraries/libwpe/libwpe.SlackBuild @@ -78,6 +78,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/libzim/icu76.patch b/libraries/libzim/icu76.patch new file mode 100644 index 0000000000..9be3708222 --- /dev/null +++ b/libraries/libzim/icu76.patch @@ -0,0 +1,21 @@ +diff -Naur libzim-9.2.3.orig/meson.build libzim-9.2.3/meson.build +--- libzim-9.2.3.orig/meson.build 2024-08-28 20:56:57.000000000 +0200 ++++ libzim-9.2.3/meson.build 2025-03-04 11:30:32.120706000 +0100 +@@ -77,9 +77,15 @@ + endif + + if xapian_dep.found() +- icu_dep = dependency('icu-i18n', static:static_linkage) ++ icu_dep = [ ++ dependency('icu-i18n', static:static_linkage), ++ dependency('icu-uc', static:static_linkage) ++ ] + else +- icu_dep = dependency('icu-i18n', required:false, static:static_linkage) ++ icu_dep = [ ++ dependency('icu-i18n', required:false, static:static_linkage), ++ dependency('icu-uc', required:false, static:static_linkage) ++ ] + endif + + gtest_dep = dependency('gtest', version: '>=1.10.0', main:true, fallback:['gtest', 'gtest_main_dep'], required:false) diff --git a/libraries/libzim/libzim.SlackBuild b/libraries/libzim/libzim.SlackBuild index ffa6a664ed..51ef3cc4d9 100644 --- a/libraries/libzim/libzim.SlackBuild +++ b/libraries/libzim/libzim.SlackBuild @@ -77,6 +77,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/icu76.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild b/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild index 9f8403e6ec..7b5f0e9abe 100644 --- a/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild +++ b/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild @@ -63,6 +63,7 @@ cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ .. make make install DESTDIR=$PKG diff --git a/libraries/mbedtls/mbedtls.SlackBuild b/libraries/mbedtls/mbedtls.SlackBuild index 792cd7af56..eecbaf39aa 100644 --- a/libraries/mbedtls/mbedtls.SlackBuild +++ b/libraries/mbedtls/mbedtls.SlackBuild @@ -89,6 +89,7 @@ cd build -DUSE_STATIC_MBEDTLS_LIBRARY=OFF \ -DENABLE_TESTING=OFF \ -DCMAKE_SKIP_RPATH=TRUE \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/mlt-bindings/mlt-bindings.SlackBuild b/libraries/mlt-bindings/mlt-bindings.SlackBuild index e6af79850b..4ed897d1ab 100644 --- a/libraries/mlt-bindings/mlt-bindings.SlackBuild +++ b/libraries/mlt-bindings/mlt-bindings.SlackBuild @@ -13,7 +13,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mlt-bindings SRCNAM=mlt -VERSION=${VERSION:-7.4.0} +VERSION=${VERSION:-7.32.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/mlt-bindings/mlt-bindings.info b/libraries/mlt-bindings/mlt-bindings.info index f20a6f08ce..b8dc7cf619 100644 --- a/libraries/mlt-bindings/mlt-bindings.info +++ b/libraries/mlt-bindings/mlt-bindings.info @@ -1,8 +1,8 @@ PRGNAM="mlt-bindings" -VERSION="7.4.0" +VERSION="7.32.0" HOMEPAGE="https://www.mltframework.org/" -DOWNLOAD="https://github.com/mltframework/mlt/releases/download/v7.4.0/mlt-7.4.0.tar.gz" -MD5SUM="4bc74ec681e67310340bafc235178a81" +DOWNLOAD="https://github.com/mltframework/mlt/releases/download/v7.32.0/mlt-7.32.0.tar.gz" +MD5SUM="d8ade248452e023366f4a0e3d20612ca" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" diff --git a/libraries/mtxclient/mtxclient.SlackBuild b/libraries/mtxclient/mtxclient.SlackBuild index b25609fbde..c91e4344d8 100644 --- a/libraries/mtxclient/mtxclient.SlackBuild +++ b/libraries/mtxclient/mtxclient.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mtxclient -VERSION=${VERSION:-0.9.2} +VERSION=${VERSION:-0.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/mtxclient/mtxclient.info b/libraries/mtxclient/mtxclient.info index eb1e03bb77..5f16ef1165 100644 --- a/libraries/mtxclient/mtxclient.info +++ b/libraries/mtxclient/mtxclient.info @@ -1,8 +1,8 @@ PRGNAM="mtxclient" -VERSION="0.9.2" +VERSION="0.10.1" HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient" -DOWNLOAD="https://github.com/Nheko-Reborn/mtxclient/archive/v0.9.2/mtxclient-0.9.2.tar.gz" -MD5SUM="72e500ad8c9d0d54084f30a6fee759de" +DOWNLOAD="https://github.com/Nheko-Reborn/mtxclient/archive/v0.10.1/mtxclient-0.10.1.tar.gz" +MD5SUM="55adb44d926e91fe4026609e9d2c9215" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="coeurl olm nlohmann_json re2 gtest" diff --git a/libraries/mujs/README b/libraries/mujs/README deleted file mode 100644 index fa4de23886..0000000000 --- a/libraries/mujs/README +++ /dev/null @@ -1,13 +0,0 @@ -MuJS is a lightweight Javascript interpreter designed for embedding -in other software to extend them with scripting capabilities. It -is written in portable C and implements ECMAScript as specified by -ECMA-262. - -Why? Because V8, SpiderMonkey and JavaScriptCore are all too big and -complex. MuJS's focus is on small size, correctness and simplicity. - -The interface for binding with native code is designed to be as -simple as possible to use, and is similar to Lua. There is no need -for interacting with byzantine C++ template mechanisms, or worry -about marking and unmarking garbage collection roots, or wrestle with -obscure build systems. diff --git a/libraries/mujs/mujs.SlackBuild b/libraries/mujs/mujs.SlackBuild deleted file mode 100644 index 316830b9ae..0000000000 --- a/libraries/mujs/mujs.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -# Slackware build script for mujs - -# Written by Valerio Talora -# Copyright (c) 2018 (versions 1.0.3-1.0.5) Andreas Guldstrand -# Copyright (c) 2020-2023 Christoph Willing, Brisbane, Australia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20220419 bkw: Modified by SlackBuilds.org, BUILD=2: -# - fix permission on png file in doc dir. -# - i486 => i586. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=mujs -VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - SLKLDFLAGS="-L/usr/X11R6/lib64" -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 || exit 1 -patch -p0 --verbose < $CWD/set-library-soname-version.diff - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -chmod 644 docs/*.png - -make shared && make install-shared \ - prefix=/usr \ - libdir=/usr/lib${LIBDIRSUFFIX} \ - DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING README 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 diff --git a/libraries/mujs/mujs.info b/libraries/mujs/mujs.info deleted file mode 100644 index 8d50d5ec6f..0000000000 --- a/libraries/mujs/mujs.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mujs" -VERSION="1.3.2" -HOMEPAGE="https://mujs.com/" -DOWNLOAD="https://mujs.com/downloads/mujs-1.3.2.tar.xz" -MD5SUM="c2221592e7033fd32cc399e24ca44f18" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Christoph Willing" -EMAIL="chris.willing@linux.com" diff --git a/libraries/mujs/set-library-soname-version.diff b/libraries/mujs/set-library-soname-version.diff deleted file mode 100644 index 94cc128665..0000000000 --- a/libraries/mujs/set-library-soname-version.diff +++ /dev/null @@ -1,48 +0,0 @@ ---- Makefile.orig 2022-11-08 02:24:56.000000000 +1100 -+++ Makefile 2024-12-29 20:22:02.927325224 +1100 -@@ -23,6 +23,8 @@ - - # Compiler flags for various configurations: - -+SO_VERSION=1 -+ - CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter - - ifeq "$(CC)" "clang" -@@ -40,7 +42,6 @@ - LDFLAGS += -fsanitize=address - else ifeq "$(build)" "release" - CFLAGS += -O2 -- LDFLAGS += -Wl,-s - endif - - ifeq "$(HAVE_READLINE)" "yes" -@@ -88,7 +89,8 @@ - - $(OUT)/libmujs.$(SO_EXT): one.c $(HDRS) - @ mkdir -p $(@D) -- $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm -+ $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -Wl,-soname,libmujs.$(SO_EXT).$(SO_VERSION) -o $@ $< -lm -+ ln -sf libmujs.$(SO_EXT).$(SO_VERSION) $@ - - libmujs ?= libmujs.a - -@@ -127,7 +129,9 @@ - install -m 644 $(OUT)/libmujs.a $(DESTDIR)$(libdir) - - install-shared: install-common $(OUT)/libmujs.$(SO_EXT) -- install -m 755 $(OUT)/libmujs.$(SO_EXT) $(DESTDIR)$(libdir) -+ install -m 755 $(OUT)/libmujs.$(SO_EXT).$(SO_VERSION) $(DESTDIR)$(libdir) -+ cp -af build/release/libmujs.$(SO_EXT) $(DESTDIR)$(libdir) -+ chmod 0755 $(DESTDIR)$(libdir) - - install: install-static - -@@ -137,6 +141,7 @@ - rm -f $(DESTDIR)$(libdir)/pkgconfig/mujs.pc - rm -f $(DESTDIR)$(libdir)/libmujs.a - rm -f $(DESTDIR)$(libdir)/libmujs.$(SO_EXT) -+ rm -f $(DESTDIR)$(libdir)/libmujs.$(SO_EXT).$(SO_VERSION) - - tarball: - git archive --format=zip --prefix=mujs-$(VERSION)/ HEAD > mujs-$(VERSION).zip diff --git a/libraries/mujs/slack-desc b/libraries/mujs/slack-desc deleted file mode 100644 index 779d124fb2..0000000000 --- a/libraries/mujs/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -mujs: mujs (javascript interpreter) -mujs: -mujs: MuJS is a lightweight Javascript interpreter designed for embedding -mujs: in other software to extend them with scripting capabilities. It is -mujs: written in portable C and implements ECMAScript as specified by -mujs: ECMA-262. -mujs: -mujs: Why? Because V8, SpiderMonkey and JavaScriptCore are all too big -mujs: and complex. -mujs: MuJS's focus is on small size, correctness and simplicity. -mujs: diff --git a/libraries/nghttp3/README b/libraries/nghttp3/README deleted file mode 100644 index 7170da6f09..0000000000 --- a/libraries/nghttp3/README +++ /dev/null @@ -1,42 +0,0 @@ -nghttp3 -======= - -nghttp3 is an implementation of `RFC 9114 -`_ HTTP/3 mapping over -QUIC and `RFC 9204 `_ -QPACK in C. - -It does not depend on any particular QUIC transport implementation. - -Documentation -------------- - -`Online documentation `_ is available. - -HTTP/3 ------- - -This library implements `RFC 9114 -`_ HTTP/3. It does not -support server push. - -The following extensions have been implemented: - -- `Extensible Prioritization Scheme for HTTP - `_ -- `Bootstrapping WebSockets with HTTP/3 - `_ - -QPACK ------ - -This library implements `RFC 9204 -`_ QPACK. It supports -dynamic table. - -License -------- - -The MIT License - -Copyright (c) 2019 nghttp3 contributors diff --git a/libraries/nghttp3/nghttp3.SlackBuild b/libraries/nghttp3/nghttp3.SlackBuild deleted file mode 100644 index 4b3eca010b..0000000000 --- a/libraries/nghttp3/nghttp3.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -# Slackware build script for nghttp3 -# Copyright 2023 Lockywolf - -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=nghttp3 -VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi -set -e -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -sed -i '/find_package(CUnit 2.1)/d' CMakeLists.txt - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DMAN_INSTALL_DIR=/usr/man \ - -DENABLE_STATIC_LIB=OFF \ - -DENABLE_LIB_ONLY=ON \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc -mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $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 -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/nghttp3/nghttp3.info b/libraries/nghttp3/nghttp3.info deleted file mode 100644 index 0f81d7f84c..0000000000 --- a/libraries/nghttp3/nghttp3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nghttp3" -VERSION="1.1.0" -HOMEPAGE="https://github.com/ngtcp2/nghttp3" -DOWNLOAD="https://github.com/ngtcp2/nghttp3/releases/download/v1.1.0/nghttp3-1.1.0.tar.gz" -MD5SUM="ea019228256d4f883cc6f4ca634b8bd0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Lockywolf" -EMAIL="for_sbo.nghttp3_2023-05-17@lockywolf.net" diff --git a/libraries/nghttp3/slack-desc b/libraries/nghttp3/slack-desc deleted file mode 100644 index efc49a5abb..0000000000 --- a/libraries/nghttp3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nghttp3: nghttp3 (an implementation of RFC 9114 HTTP/3 over QUIC) -nghttp3: -nghttp3: nghttp3 is an implementation of RFC 9114 HTTP/3 mapping over QUIC -nghttp3: and RFC 9204 QPACK in C. -nghttp3: It does not depend on any particular QUIC transport implementation. -nghttp3: -nghttp3: -nghttp3: -nghttp3: -nghttp3: -nghttp3: diff --git a/libraries/ngtcp2/ngtcp2.SlackBuild b/libraries/ngtcp2/ngtcp2.SlackBuild index 5285df76e3..d16b4b657f 100644 --- a/libraries/ngtcp2/ngtcp2.SlackBuild +++ b/libraries/ngtcp2/ngtcp2.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ngtcp2 -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-1.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -116,4 +116,4 @@ cp -a \ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE +/sbin/makepkg --remove-rpaths -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/ngtcp2/ngtcp2.info b/libraries/ngtcp2/ngtcp2.info index cd3cb8745f..5b9b3a3223 100644 --- a/libraries/ngtcp2/ngtcp2.info +++ b/libraries/ngtcp2/ngtcp2.info @@ -1,8 +1,8 @@ PRGNAM="ngtcp2" -VERSION="1.2.0" +VERSION="1.8.0" HOMEPAGE="https://github.com/ngtcp2/ngtcp2/" -DOWNLOAD="https://github.com/ngtcp2/ngtcp2/releases/download/v1.2.0/ngtcp2-1.2.0.tar.gz" -MD5SUM="d19df333cb0b0bc95046dfd30f5b7348" +DOWNLOAD="https://github.com/ngtcp2/ngtcp2/releases/download/v1.8.0/ngtcp2-1.8.0.tar.gz" +MD5SUM="73e7dca33392a90f29f6bf0aaf3f26f1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libev nghttp3" diff --git a/libraries/nlohmann_json/nlohmann_json.SlackBuild b/libraries/nlohmann_json/nlohmann_json.SlackBuild index fb9eb93611..e3a0720448 100644 --- a/libraries/nlohmann_json/nlohmann_json.SlackBuild +++ b/libraries/nlohmann_json/nlohmann_json.SlackBuild @@ -82,12 +82,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + +for i in $CWD/patches/* ; do patch -p1 < $i ; done + mkdir -p build cd build cmake \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DJSON_BuildTests=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/nlohmann_json/patches/1_6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch b/libraries/nlohmann_json/patches/1_6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch new file mode 100644 index 0000000000..6f133312ee --- /dev/null +++ b/libraries/nlohmann_json/patches/1_6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch @@ -0,0 +1,55 @@ +From 6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Wed, 8 Mar 2023 11:31:56 +0000 +Subject: [PATCH] custom allocators: define missing 'rebind' type (#3895) + +--- + tests/src/unit-allocator.cpp | 9 +++++++++ + tests/src/unit-regression2.cpp | 9 +++++++++ + 2 files changed, 18 insertions(+) + +diff --git a/tests/src/unit-allocator.cpp b/tests/src/unit-allocator.cpp +index 76e3b03f10..f2e63552a4 100644 +--- a/tests/src/unit-allocator.cpp ++++ b/tests/src/unit-allocator.cpp +@@ -20,11 +20,20 @@ struct bad_allocator : std::allocator + { + using std::allocator::allocator; + ++ bad_allocator() = default; ++ template bad_allocator(const bad_allocator& /*unused*/) { } ++ + template + void construct(T* /*unused*/, Args&& ... /*unused*/) + { + throw std::bad_alloc(); + } ++ ++ template ++ struct rebind ++ { ++ using other = bad_allocator; ++ }; + }; + } // namespace + +diff --git a/tests/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp +index 2bb9b32e51..dbafb436ba 100644 +--- a/tests/src/unit-regression2.cpp ++++ b/tests/src/unit-regression2.cpp +@@ -189,6 +189,15 @@ class my_allocator : public std::allocator + { + public: + using std::allocator::allocator; ++ ++ my_allocator() = default; ++ template my_allocator(const my_allocator& /*unused*/) { } ++ ++ template ++ struct rebind ++ { ++ using other = my_allocator; ++ }; + }; + + ///////////////////////////////////////////////////////////////////// diff --git a/libraries/nlohmann_json/patches/2_660d0b58565073975d6f5d94365d6cbf150a4cf8.patch b/libraries/nlohmann_json/patches/2_660d0b58565073975d6f5d94365d6cbf150a4cf8.patch new file mode 100644 index 0000000000..d14345f40e --- /dev/null +++ b/libraries/nlohmann_json/patches/2_660d0b58565073975d6f5d94365d6cbf150a4cf8.patch @@ -0,0 +1,24 @@ +From 660d0b58565073975d6f5d94365d6cbf150a4cf8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= +Date: Sun, 5 Mar 2023 14:11:22 +0100 +Subject: [PATCH] tests/unit-iterators2: use std::ranges::equals for range + comparisons (#3950) + +Closes https://github.com/nlohmann/json/issues/3927 +--- + tests/src/unit-iterators2.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/src/unit-iterators2.cpp b/tests/src/unit-iterators2.cpp +index 27926084c7..72a5d9dc5c 100644 +--- a/tests/src/unit-iterators2.cpp ++++ b/tests/src/unit-iterators2.cpp +@@ -943,7 +943,7 @@ TEST_CASE("iterators 2") + json j_expected{5, 4, 3, 2, 1}; + + auto reversed = j | std::views::reverse; +- CHECK(reversed == j_expected); ++ CHECK(std::ranges::equal(reversed, j_expected)); + } + + SECTION("transform") diff --git a/libraries/nv-codec-headers/README b/libraries/nv-codec-headers/README deleted file mode 100644 index 3509867132..0000000000 --- a/libraries/nv-codec-headers/README +++ /dev/null @@ -1,18 +0,0 @@ -The FFmpeg version of Nvidia Codec SDK headers which are required -to interface with Nvidia's codec APIs. The purpose of these -headers is to allow hardware (GPU) encoding with suitable NVidia -cards. This version corresponds to Video Codec SDK version 11.1.5 -and requires NVidia drivers version 470.57.02 or newer. - -There are 3 stages in the history of NVidia GPU encoding with FFmpeg: - - 1. Pre August 27th 2016 it was necessary to track down your own - headers to build nvenc. - 2. Post August 27th 2016 the required headers were incorporated - as part of the FFmpeg source. - 3. Post February 26th 2018 the NVidia headers were removed from - the FFmpeg source and a separate git repository was created - to hold continuing work with these headers. - -This nv-codec-headers script is for point 3 where the headers will -need to be installed before compiling a recent FFmpeg. diff --git a/libraries/nv-codec-headers/nv-codec-headers.SlackBuild b/libraries/nv-codec-headers/nv-codec-headers.SlackBuild deleted file mode 100644 index 1faff221c0..0000000000 --- a/libraries/nv-codec-headers/nv-codec-headers.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Slackware build script for nv-codec-headers - -# Copyright 2018-2023, Andrew Strong, Blue Mountains, Australia. -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=nv-codec-headers -# Note that the version number is contained -# within the file ffnvcodec.pc.in: -VERSION=${VERSION:-11.1.5.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $PKG -cd $TMP -rm -rf $PRGNAM - -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 . - -make PREFIX=/usr LIBDIR=lib${LIBDIRSUFFIX} install DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/nv-codec-headers/nv-codec-headers.info b/libraries/nv-codec-headers/nv-codec-headers.info deleted file mode 100644 index 47f4502ae1..0000000000 --- a/libraries/nv-codec-headers/nv-codec-headers.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nv-codec-headers" -VERSION="11.1.5.2" -HOMEPAGE="https://github.com/FFmpeg/nv-codec-headers" -DOWNLOAD="https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.1.5.2/nv-codec-headers-11.1.5.2.tar.gz" -MD5SUM="94fd5479bf934595530d9bfae93c1c55" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andrew Strong" -EMAIL="andrew.david.strong@gmail.com" diff --git a/libraries/nv-codec-headers/slack-desc b/libraries/nv-codec-headers/slack-desc deleted file mode 100644 index 8187a52c58..0000000000 --- a/libraries/nv-codec-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------------------------------------------------------| -nv-codec-headers: nv-codec-headers (FFmpeg version of Nvidia Codec SDK headers) -nv-codec-headers: -nv-codec-headers: FFmpeg version of headers required to interface with Nvidia's -nv-codec-headers: codec APIs. Corresponds to Video Codec SDK version 11.1.5. -nv-codec-headers: -nv-codec-headers: -nv-codec-headers: -nv-codec-headers: https://github.com/FFmpeg/nv-codec-headers -nv-codec-headers: -nv-codec-headers: -nv-codec-headers: diff --git a/libraries/nx-libs/nx-libs.SlackBuild b/libraries/nx-libs/nx-libs.SlackBuild index fbc40c8eb6..3bfbde87c1 100644 --- a/libraries/nx-libs/nx-libs.SlackBuild +++ b/libraries/nx-libs/nx-libs.SlackBuild @@ -34,12 +34,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nx-libs -VERSION=${VERSION:-3.5.99.26} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.5.99.27} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -SRCVERSION=$(echo $VERSION | tr _ - ) +SRCVERSION=$(echo $VERSION | tr - _ ) if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -81,7 +81,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$SRCVERSION -tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz +tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.?z cd $PRGNAM-$SRCVERSION chown -R root:root . find -L . \ @@ -90,14 +90,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 {} \; -# Fix for the newer binutils (no more l flag for ar) -sed -i -e "s|ArCmdBase\ clq|ArCmdBase cq|" \ - -e "s|ArCmdBase\ rul|ArCmdBase ru|" \ - -e "s|ArCmdBase\ xl|ArCmdBase x|" \ - nx-X11/config/cf/Imake.tmpl +echo "#define OptimizedCDebugFlags $SLKCFLAGS -fpermissive GccAliasingArgs" >> nx-X11/config/cf/host.def +echo "#define OptimizedCplusplusDebugFlags $SLKCFLAGS GccAliasingArgs" >> nx-X11/config/cf/host.def # Fix man install dir -sed -i "s|share/man|man|g" Makefile +sed -i "s|share/man|man|g" Makefile || exit 1 make -j1 CONFIGURE="./configure --libdir=/usr/lib${LIBDIRSUFFIX} --prefix=/usr --mandir=/usr/man" PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} IMAKE_DEFINES="-DUseTIRPC=YES" diff --git a/libraries/nx-libs/nx-libs.info b/libraries/nx-libs/nx-libs.info index 61974a26a5..71d383bb48 100644 --- a/libraries/nx-libs/nx-libs.info +++ b/libraries/nx-libs/nx-libs.info @@ -1,8 +1,8 @@ PRGNAM="nx-libs" -VERSION="3.5.99.26" +VERSION="3.5.99.27" HOMEPAGE="http://www.x2go.org" -DOWNLOAD="https://github.com/ArcticaProject/nx-libs/archive/3.5.99.26/nx-libs-3.5.99.26.tar.gz" -MD5SUM="ce874313e69f1a0f8c09c7363b006f66" +DOWNLOAD="https://github.com/ArcticaProject/nx-libs/archive/3.5.99.27/nx-libs-3.5.99.27.tar.gz" +MD5SUM="f4b73c5e904a14388916d153effb6f69" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/ogre/README b/libraries/ogre/README index 651c87caf3..b1fc2b8c81 100644 --- a/libraries/ogre/README +++ b/libraries/ogre/README @@ -31,7 +31,8 @@ For example, in order to build samples too, launch from super user: OGRE_BUILD_SAMPLES=ON ./ogre.SlackBuild Optional dependencies available at SlackBuilds.org: -zziplib, FreeImage, tbb, cppunit, ois, nvidia-cg-toolkit +zziplib, FreeImage, tbb, cppunit, ois, nvidia-cg-toolkit, a jdk +(tested with zulu-openjdk17) Optional dependencies NOT (yet) available at SlackBuilds.org: opengles, POCO diff --git a/libraries/ogre/e34ef06bb0d49ce847efe3a80ebe01c9762ea0b1.patch b/libraries/ogre/e34ef06bb0d49ce847efe3a80ebe01c9762ea0b1.patch deleted file mode 100644 index b49026b0db..0000000000 --- a/libraries/ogre/e34ef06bb0d49ce847efe3a80ebe01c9762ea0b1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e34ef06bb0d49ce847efe3a80ebe01c9762ea0b1 Mon Sep 17 00:00:00 2001 -From: Pavel Rojtberg -Date: Fri, 11 Feb 2022 20:26:57 +0100 -Subject: [PATCH] CMake: rename FeatureSummary.cmake to avoid name clashes - ---- - CMake/{FeatureSummary.cmake => OgreFeatureSummary.cmake} | 0 - CMakeLists.txt | 2 +- - 2 files changed, 1 insertion(+), 1 deletion(-) - rename CMake/{FeatureSummary.cmake => OgreFeatureSummary.cmake} (100%) - -diff --git a/CMake/FeatureSummary.cmake b/CMake/OgreFeatureSummary.cmake -similarity index 100% -rename from CMake/FeatureSummary.cmake -rename to CMake/OgreFeatureSummary.cmake -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8583b8882f0..544a7643d68 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -512,4 +512,4 @@ include(Packaging) - - - # Show feature summary --include(FeatureSummary) -+include(OgreFeatureSummary) diff --git a/libraries/ogre/ogre.SlackBuild b/libraries/ogre/ogre.SlackBuild index ae6fe728a7..04b0ddc3e0 100644 --- a/libraries/ogre/ogre.SlackBuild +++ b/libraries/ogre/ogre.SlackBuild @@ -40,9 +40,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ogre -VERSION=${VERSION:-13.2.4} -IMGUIVER=${IMGUIVER:-1.85} -BUILD=${BUILD:-2} +VERSION=${VERSION:-14.3.4} +IMGUIVER=${IMGUIVER:-1.92.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -54,9 +54,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -100,7 +97,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + -patch -p1 < $CWD/e34ef06bb0d49ce847efe3a80ebe01c9762ea0b1.patch +sed -i 's|set(PYTHON_SITE_PACKAGES lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages/Ogre/)|set(PYTHON_SITE_PACKAGES lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages/Ogre/ CACHE FILEPATH "")|' Components/Python/CMakeLists.txt mkdir build cd build @@ -115,6 +112,7 @@ cd build -DOGRE_BUILD_DEPENDENCIES=FALSE \ -DOGRE_BUILD_PLUGIN_FREEIMAGE=TRUE \ -DOGRE_INSTALL_SAMPLES_SOURCE=$OGRE_INSTALL_SAMPLES_SOURCE \ + -DPYTHON_SITE_PACKAGES=$(python -c "import sysconfig; print(sysconfig.get_paths()[\"platlib\"]+'/Ogre/')") \ -DOGRE_BUILD_COMPONENT_CSHARP=FALSE \ ../ make diff --git a/libraries/ogre/ogre.info b/libraries/ogre/ogre.info index d24d94a101..efe56948d2 100644 --- a/libraries/ogre/ogre.info +++ b/libraries/ogre/ogre.info @@ -1,10 +1,10 @@ PRGNAM="ogre" -VERSION="13.2.4" +VERSION="14.3.4" HOMEPAGE="https://www.ogre3d.org/" -DOWNLOAD="https://github.com/OGRECave/ogre/archive/v13.2.4/ogre-13.2.4.zip \ - https://github.com/ocornut/imgui/archive/v1.85/imgui-1.85.tar.gz" -MD5SUM="b540b3feaebe530370c659013c144d23 \ - bb710a24164a8dd54369bc4282d9d3b9" +DOWNLOAD="https://github.com/OGRECave/ogre/archive/v14.3.4/ogre-14.3.4.zip \ + https://github.com/ocornut/imgui/archive/v1.92.1/imgui-1.92.1.tar.gz" +MD5SUM="24e6a4a5ed7f343a3e2e8af4d714455b \ + 68a3126462b7f2ebcd9b0d0c7dda93ad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pugixml" diff --git a/libraries/ois/ois.SlackBuild b/libraries/ois/ois.SlackBuild index e27a7305bd..16d56c70ea 100644 --- a/libraries/ois/ois.SlackBuild +++ b/libraries/ois/ois.SlackBuild @@ -26,8 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ois SRCDIR=OIS -VERSION=${VERSION:-1.5.0} -SRCVER=1.5 +VERSION=${VERSION:-1.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -71,9 +67,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCDIR-$SRCVER -tar xvf $CWD/$SRCDIR-$SRCVER.tar.gz -cd $SRCDIR-$SRCVER +rm -rf $SRCDIR-$VERSION +tar xvf $CWD/$SRCDIR-$VERSION.tar.?z +cd $SRCDIR-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -85,13 +81,16 @@ sed -i \ -e "s|lib$|lib${LIBDIRSUFFIX}|" \ -e "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" CMakeLists.txt +# cmake barfs on X11 but at least before that it seems to generate +# a working (?) Makefile... mkdir -p build cd build - cmake -G "Unix Makefiles" \ + cmake \ -DCMAKE_INSTALL_PREFIX:PATH="/usr" \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release .. + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ + -DCMAKE_BUILD_TYPE=Release .. || true make VERBOSE=1 make install DESTDIR=$PKG diff --git a/libraries/ois/ois.info b/libraries/ois/ois.info index 946b04be90..70075f5dff 100644 --- a/libraries/ois/ois.info +++ b/libraries/ois/ois.info @@ -1,8 +1,8 @@ PRGNAM="ois" -VERSION="1.5.0" +VERSION="1.5.1" HOMEPAGE="https://github.com/wgois/OIS" -DOWNLOAD="https://github.com/wgois/OIS/archive/v1.5/OIS-1.5.tar.gz" -MD5SUM="be8095ddc0eae530004d4d3abcf01e6d" +DOWNLOAD="https://github.com/wgois/OIS/archive/v1.5.1/OIS-1.5.1.tar.gz" +MD5SUM="75cda7939647c4f8a6e7eb61845c60c9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/olm/olm.SlackBuild b/libraries/olm/olm.SlackBuild index 4cf9ad442d..5b088c1eeb 100644 --- a/libraries/olm/olm.SlackBuild +++ b/libraries/olm/olm.SlackBuild @@ -88,6 +88,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ -DCMAKE_FIND_USE_PACKAGE_ROOT_PATH=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make ( cd tests ; ctest . ) diff --git a/libraries/openvino/010-openvino-disable-werror.patch b/libraries/openvino/010-openvino-disable-werror.patch new file mode 100644 index 0000000000..2a168ec344 --- /dev/null +++ b/libraries/openvino/010-openvino-disable-werror.patch @@ -0,0 +1,13 @@ +--- a/src/plugins/intel_gpu/CMakeLists.txt ++++ b/src/plugins/intel_gpu/CMakeLists.txt +@@ -46,10 +46,6 @@ set(INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") + add_subdirectory(thirdparty) + include(thirdparty/cmake/rapidjson.cmake) + +-if(CMAKE_COMPILER_IS_GNUCXX) +- ov_add_compiler_flags(-Werror) +-endif() +- + add_subdirectory(src/runtime) + add_subdirectory(src/kernel_selector) + add_subdirectory(src/graph) diff --git a/libraries/openvino/020-openvino-use-protobuf-shared-libs.patch b/libraries/openvino/020-openvino-use-protobuf-shared-libs.patch new file mode 100644 index 0000000000..b72bd88db4 --- /dev/null +++ b/libraries/openvino/020-openvino-use-protobuf-shared-libs.patch @@ -0,0 +1,11 @@ +--- a/thirdparty/dependencies.cmake ++++ b/thirdparty/dependencies.cmake +@@ -318,7 +318,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND + # Note: Debian / Ubuntu / RHEL libprotobuf.a can only be used with -DBUILD_SHARED_LIBS=OFF + # because they are compiled without -fPIC + if(NOT DEFINED Protobuf_USE_STATIC_LIBS) +- set(Protobuf_USE_STATIC_LIBS ON) ++ set(Protobuf_USE_STATIC_LIBS OFF) + endif() + if(CMAKE_VERBOSE_MAKEFILE) + set(Protobuf_DEBUG ON) diff --git a/libraries/openvino/openvino.SlackBuild b/libraries/openvino/openvino.SlackBuild index 59dc97e785..c7ed7ea598 100644 --- a/libraries/openvino/openvino.SlackBuild +++ b/libraries/openvino/openvino.SlackBuild @@ -90,6 +90,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + +patch -p1 < $CWD/010-openvino-disable-werror.patch +patch -p1 < $CWD/020-openvino-use-protobuf-shared-libs.patch + # Flatbuffers from SBo provide broken cmake files(static-lib removed but static-lib-cmake-files not removed) ( cd thirdparty/flatbuffers/ diff --git a/libraries/physfs/physfs.SlackBuild b/libraries/physfs/physfs.SlackBuild index 13b100f75f..5baaf4c69e 100644 --- a/libraries/physfs/physfs.SlackBuild +++ b/libraries/physfs/physfs.SlackBuild @@ -90,6 +90,7 @@ cmake \ -DPHYSFS_BUILD_TEST=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DLIB_SUFFIX:STRING=${LIBDIRSUFFIX} . make diff --git a/libraries/plog/plog.SlackBuild b/libraries/plog/plog.SlackBuild index f9a799218e..378c5f32bc 100644 --- a/libraries/plog/plog.SlackBuild +++ b/libraries/plog/plog.SlackBuild @@ -85,6 +85,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/poco/poco.SlackBuild b/libraries/poco/poco.SlackBuild index fa34c7a8c4..6f64f5a267 100644 --- a/libraries/poco/poco.SlackBuild +++ b/libraries/poco/poco.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=poco -VERSION=${VERSION:-1.13.3} +VERSION=${VERSION:-1.14.1} EDITION=all BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/poco/poco.info b/libraries/poco/poco.info index d756b55862..ecfeab5822 100644 --- a/libraries/poco/poco.info +++ b/libraries/poco/poco.info @@ -1,8 +1,8 @@ PRGNAM="poco" -VERSION="1.13.3" +VERSION="1.14.1" HOMEPAGE="https://pocoproject.org" -DOWNLOAD="https://pocoproject.org/releases/poco-1.13.3/poco-1.13.3-all.tar.bz2" -MD5SUM="ec5ce614fff2ed1825bb776fa1292d4d" +DOWNLOAD="https://pocoproject.org/releases/poco-1.14.1/poco-1.14.1-all.tar.bz2" +MD5SUM="30d6559345f1f10764143902f9f6b246" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/ptex/ptex.SlackBuild b/libraries/ptex/ptex.SlackBuild index eb31aef135..75c76d06d0 100644 --- a/libraries/ptex/ptex.SlackBuild +++ b/libraries/ptex/ptex.SlackBuild @@ -92,7 +92,6 @@ cd build $OPT_BUILD \ -DCMAKE_BUILD_TYPE=Release .. make - make test make install/strip DESTDIR=$PKG cd .. diff --git a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild index ae25564038..dfc4cdc6fa 100644 --- a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild +++ b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-PyQtWebEngine SRCNAM=${PRGNAM#*-} -VERSION=${VERSION:-5.15.3} +VERSION=${VERSION:-5.15.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -85,21 +85,20 @@ export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5 export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" -python3 configure.py \ - --verbose \ - -q /usr/bin/qmake-qt5 \ - --sip=/usr/bin/sip3 \ - --sip-incdir=$(pkg-config --cflags-only-I python3 | sed 's/^-I//') - +sip-build \ + --no-make \ + --api-dir /usr/share/qt5/qsci/api/python +cd build make -make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG +make INSTALL_ROOT="$PKG" install +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - ChangeLog LICENSE NEWS README \ + ChangeLog LICENSE NEWS README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info index 99722b4769..dc20f4c0a3 100644 --- a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info +++ b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info @@ -1,8 +1,8 @@ PRGNAM="python3-PyQtWebEngine" -VERSION="5.15.3" +VERSION="5.15.7" HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro" -DOWNLOAD="https://pypi.python.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-5.15.3.tar.gz" -MD5SUM="e346b3ed6c2c9f8d8f8323fcf777f7ae" +DOWNLOAD="https://pypi.python.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-5.15.7.tar.gz" +MD5SUM="a3394e93d8b5077e8355f57d79c2ed58" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/python3-ruamel.yaml.clib/python3-ruamel.yaml.clib.SlackBuild b/libraries/python3-ruamel.yaml.clib/python3-ruamel.yaml.clib.SlackBuild index ea03cf6e35..4ddf41c8b6 100644 --- a/libraries/python3-ruamel.yaml.clib/python3-ruamel.yaml.clib.SlackBuild +++ b/libraries/python3-ruamel.yaml.clib/python3-ruamel.yaml.clib.SlackBuild @@ -80,7 +80,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 {} \; -python3 -m build --wheel --no-isolation +CFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/libraries/pytorch/pytorch.SlackBuild b/libraries/pytorch/pytorch.SlackBuild index 00dddeabf0..599dfaf234 100644 --- a/libraries/pytorch/pytorch.SlackBuild +++ b/libraries/pytorch/pytorch.SlackBuild @@ -92,7 +92,7 @@ cd build unshare -n cmake \ -G Ninja \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=maybe-uninitialized" \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DLIBSHM_INSTALL_LIB_SUBDIR="lib$LIBDIRSUFFIX" \ diff --git a/libraries/qt4/patches/qt-everywhere-opensource-src-4.8.7-icu59.patch b/libraries/qt4/patches/qt-everywhere-opensource-src-4.8.7-icu59.patch index 3edcdef02b..82eb72c171 100644 --- a/libraries/qt4/patches/qt-everywhere-opensource-src-4.8.7-icu59.patch +++ b/libraries/qt4/patches/qt-everywhere-opensource-src-4.8.7-icu59.patch @@ -14,15 +14,30 @@ Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri contains(QT_CONFIG,icu) { - SOURCES += tools/qlocale_icu.cpp -+ cpp11.name = cpp11 -+ cpp11.input = SOURCES_CPP11 -+ cpp11.dependency_type = TYPE_C -+ cpp11.variable_out = OBJECTS -+ cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)} -+ cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} -+ QMAKE_EXTRA_COMPILERS += cpp11 ++ cpp17.name = cpp17 ++ cpp17.input = SOURCES_CPP17 ++ cpp17.dependency_type = TYPE_C ++ cpp17.variable_out = OBJECTS ++ cpp17.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)} ++ cpp17.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++17 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} ++ QMAKE_EXTRA_COMPILERS += cpp17 + -+ SOURCES_CPP11 += tools/qlocale_icu.cpp ++ SOURCES_CPP17 += tools/qlocale_icu.cpp DEFINES += QT_USE_ICU } +--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/icu/icu.pro.orig 2015-05-07 16:14:42.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/icu/icu.pro 2019-04-18 17:14:05.122419116 +0200 +@@ -1,4 +1,11 @@ +-SOURCES = icu.cpp ++cpp17.name = cpp17 ++cpp17.input = SOURCES_CPP17 ++cpp17.dependency_type = TYPE_C ++cpp17.variable_out = OBJECTS ++cpp17.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)} ++cpp17.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++17 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} ++QMAKE_EXTRA_COMPILERS += cpp17 ++SOURCES_CPP17 = icu.cpp + CONFIG -= qt dylib app_bundle + unix:LIBS += -licuuc -licui18n + win32:LIBS += -licuin diff --git a/libraries/qt4/qt4.SlackBuild b/libraries/qt4/qt4.SlackBuild index a992f15827..e18920f468 100644 --- a/libraries/qt4/qt4.SlackBuild +++ b/libraries/qt4/qt4.SlackBuild @@ -126,8 +126,62 @@ sed -n -e 's/#.*//' -e '/./p' $CWD/patches/series | while read diff; do patch -p1 < $CWD/patches/$diff done +# Replace obsolete TR1 functions +sed -i -e 's|tr1::has_trivial_constructor|is_trivially_constructible|' \ + -e 's|tr1::has_trivial_destructor|is_trivially_destructible|' \ + src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h + +# Use rvalue of m_attributesInPrevious +# (https://bugs.webkit.org/show_bug.cgi?id=59261) +sed -i 's|, existingTransition->m_attributesInPrevious|, +existingTransition->m_attributesInPrevious|' \ + src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h +sed -i 's|, m_attributesInPrevious)|, +m_attributesInPrevious)|' \ + src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp + +# Remove auto_ptr deprecation warnings +sed -i 's|auto_ptr|unique_ptr|g' \ + src/3rdparty/javascriptcore/JavaScriptCore/wtf/*.h \ + src/3rdparty/javascriptcore/JavaScriptCore/parser/Nodes.h \ + src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/Collator* +sed -i 's|(data)|(std::move(data))|' \ + src/3rdparty/javascriptcore/JavaScriptCore/parser/Nodes.h + +# Remove invalid template usage in ctors (this is only currently a warning though) +sed -i 's|StringTypeAdapter<.*>(|StringTypeAdapter(|' \ + src/3rdparty/javascriptcore/JavaScriptCore/runtime/UString.h + +# Use the ASSERT macro that masks unused variables +sed -i 's|ASSERT(differenceBetween(label|ASSERT_UNUSED(label, differenceBetween(label|' \ + src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerX86_64.h + +# Use a proper compile-time assert function +sed -i 's|COMPILE_ASSERT(exp, name) .*|COMPILE_ASSERT(exp, name) static_assert((exp), #name)|' \ + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Assertions.h + +# Correct the swap function name +sed -i -e 's|swap(from|hashTableSwap(from|' \ + -e 's|inline void swap|inline void hashTableSwap|' \ + src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h +sed -i 's|// swap pairs|template inline void hashTableSwap(T\& a, T\& b) { swap(a, b); }\n\n&|' \ + src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h + +# Fixup obviously wrong return value +sed -i 's|return false|return nullptr|' \ + src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp + +# Silence -Wclass-memaccess warnings +sed -i 's|memcpy(dst|memcpy(reinterpret_cast(dst)|' \ + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h +sed -i -e 's|memcpy(x.p|memcpy(reinterpret_cast(x.p)|' \ + -e 's|memmove(i|memmove(reinterpret_cast(i)|' \ + src/corelib/tools/qvector.h + +# Do a SelectionFlags cast in accessible plugin +sed -i 's|QItemSelectionModel::Columns \& QItemSelectionModel::Deselect|QItemSelectionModel::SelectionFlags(&)|' \ + src/plugins/accessible/widgets/itemviews.cpp + export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks" +export CXXFLAGS="$SLKCFLAGS -std=c++17 -fpermissive -fno-delete-null-pointer-checks" export OPENSOURCE_CXXFLAGS="$CXXFLAGS" ./configure \ diff --git a/libraries/qt6/README b/libraries/qt6/README deleted file mode 100644 index b73df851a7..0000000000 --- a/libraries/qt6/README +++ /dev/null @@ -1,39 +0,0 @@ -Qt is a cross-platform application development framework for desktop, -embedded and mobile. Supported Platforms include Linux, OS X, -Windows, VxWorks, QNX, Android, iOS, BlackBerry, Sailfish OS and -others. - -Qt is not a programming language on its own. It is a framework written -in C++. A preprocessor, the MOC (Meta-Object Compiler), is used to -extend the C++ language with features like signals and slots. Before -the compilation step, the MOC parses the source files written in -Qt-extended C++ and generates standard compliant C++ sources from -them. Thus the framework itself and applications/libraries using it -can be compiled by any standard compliant C++ compiler like Clang, -GCC, ICC, MinGW and MSVC. - -Qt6 has a compiler cache option when building. By default, this -behavior is disabled. To enable it, pass CCACHE=ON to the build script. -Unless you are building qt6 multiple times, you should leave this -option OFF. - -Examples are disabled by default. To build them, pass EXAMPLES=ON -to the build script. - -When building Qt's webengine, proprietary codecs are disabled by -default. To enable them, pass PROPRIETARY_CODECS=ON to the build -script. This will make the resulting package non-redistributable. - -Qt6 requires 16GB of RAM to build, and a minimum of 40GB of available -disk storage. Disk storage requirements may increase when built -against optional dependencies. - -Qt6 will autodetect and build against multiple external programs and -libraries. To see a list of optional dependencies, please consult -README.SLACKWARE - -Qt6 can take substantial time to build and ninja automatically uses -all of your cpus power to speed up this process: if for some reason -this ends up trashing the machine on which you are building it you -can export the environment variable CMAKE_BUILD_PARALLEL_LEVEL to -set an appropriate number of parallel jobs. diff --git a/libraries/qt6/README.SLACKWARE b/libraries/qt6/README.SLACKWARE deleted file mode 100644 index 0c4a8679c3..0000000000 --- a/libraries/qt6/README.SLACKWARE +++ /dev/null @@ -1,35 +0,0 @@ -Slackware 15.0's version of clang fails to compile qt6, due to the -following error: - -Linking CXX executable qtbase/lib64/bin/lupdate -/usr/bin/ld: CMakeFiles/lupdate.dir/cpp_clang.cpp.o: undefined - reference to symbol '_ZTIN5clang7tooling21FrontendActionFactoryE' -/usr/bin/ld: /usr/lib64/libclangTooling.so.13: error adding symbols: - DSO missing from command line -clang-13: error: linker command failed with exit code 1 - -To remedy this, Qt provides a prebuilt clang package that we bootstrap -against. - -Qt6 will compile with multiple optional dependencies, such as: - - assimp - (*)db2 - (*)cerence - (*)directfb - (*)gn - (*)interbase - libb2 - (*)litehtml - (*)lttn-ust - mold - postgresql - (*)sensorfw - (*)s-log2 - snappy - (*)tslib - xmlstarlet - - ...and possibly others. - -(*) = not available from SBo at the time of writing. diff --git a/libraries/qt6/desktop/assistant-qt6.desktop b/libraries/qt6/desktop/assistant-qt6.desktop deleted file mode 100644 index 32a48bd1cd..0000000000 --- a/libraries/qt6/desktop/assistant-qt6.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Qt6 Assistant -Comment=Shows Qt6 documentation and examples -Exec=/usr/lib@LIBDIR@/qt6/bin/assistant -Icon=assistant-qt6 -Terminal=false -Type=Application -Categories=Qt;Development;Documentation; diff --git a/libraries/qt6/desktop/designer-qt6.desktop b/libraries/qt6/desktop/designer-qt6.desktop deleted file mode 100644 index 3287bad25f..0000000000 --- a/libraries/qt6/desktop/designer-qt6.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt6 Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt6 applications -Exec=/usr/lib@LIBDIR@/qt6/bin/designer -Icon=designer-qt6 -MimeType=application/x-designer; -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/libraries/qt6/desktop/linguist-qt6.desktop b/libraries/qt6/desktop/linguist-qt6.desktop deleted file mode 100644 index 837a24cf77..0000000000 --- a/libraries/qt6/desktop/linguist-qt6.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt6 Linguist -Comment=Add translations to Qt6 applications -Exec=/usr/lib@LIBDIR@/qt6/bin/linguist -Icon=linguist-qt6 -MimeType=text/vnd.trolltech.linguist;application/x-linguist; -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/libraries/qt6/desktop/qdbusviewer-qt6.desktop b/libraries/qt6/desktop/qdbusviewer-qt6.desktop deleted file mode 100644 index 7ec65d117b..0000000000 --- a/libraries/qt6/desktop/qdbusviewer-qt6.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt6 QDbusViewer -GenericName=Qt6 D-Bus Debugger -Comment=Debug D-Bus applications -Exec=/usr/lib@LIBDIR@/qt6/bin/qdbusviewer -Icon=qdbusviewer-qt6 -Terminal=false -Type=Application -Categories=Qt;Development;Debugger; diff --git a/libraries/qt6/doinst.sh b/libraries/qt6/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/libraries/qt6/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/libraries/qt6/newer_protobuf_1.patch b/libraries/qt6/newer_protobuf_1.patch deleted file mode 100644 index a5f24bf302..0000000000 --- a/libraries/qt6/newer_protobuf_1.patch +++ /dev/null @@ -1,58 +0,0 @@ -Backported to 6.5.2 from 1a610ab9c7edde2e27ff707c9e534172e288e8ed in v6.7.0-beta1~260 - -https://codereview.qt-project.org/gitweb?p=qt%2Fqtgrpc.git;a=commit;h=1a610ab9c7edde2e27ff707c9e534172e288e8ed - -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp 2024-03-12 08:14:21.885741000 +0100 -@@ -8,7 +8,6 @@ - #include - #include - #include --#include - - #include - #include -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2024-03-12 08:16:45.956741000 +0100 -@@ -12,11 +12,10 @@ - - #include - #include --#include --#include -+#include - #include - #include --#include -+#include - - using namespace ::QtGrpc; - using namespace ::qtprotoccommon; -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2024-03-12 08:17:09.574741000 +0100 -@@ -17,7 +17,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp 2024-03-12 08:18:20.905741000 +0100 -@@ -5,10 +5,9 @@ - #include "generatorbase.h" - - #include --#include --#include - #include - #include -+#include - - #include "utils.h" - #include "commontemplates.h" diff --git a/libraries/qt6/newer_protobuf_2.patch b/libraries/qt6/newer_protobuf_2.patch deleted file mode 100644 index cfd5277570..0000000000 --- a/libraries/qt6/newer_protobuf_2.patch +++ /dev/null @@ -1,42 +0,0 @@ -Backported to 6.5.2 from 2297f2da520b7eebe10dd6b5304e5a4c3c18a57c in v6.7.0-beta1~220 - -https://codereview.qt-project.org/gitweb?p=qt/qtgrpc.git;a=commit;h=2297f2da520b7eebe10dd6b5304e5a4c3c18a57c - -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2024-03-12 08:40:27.884741000 +0100 -@@ -32,13 +32,9 @@ - bool QGrpcGenerator::Generate(const FileDescriptor *file, - [[maybe_unused]] const std::string ¶meter, - GeneratorContext *generatorContext, -- std::string *error) const -+ [[maybe_unused]] std::string *error) const - { - assert(file != nullptr && generatorContext != nullptr); -- if (file->syntax() != FileDescriptor::SYNTAX_PROTO3) { -- *error = "Invalid proto used. qtgrpcgen only supports 'proto3' syntax"; -- return false; -- } - - return GenerateClientServices(file, generatorContext); - } -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2024-03-12 08:42:48.976741000 +0100 -@@ -37,15 +37,10 @@ - bool QProtobufGenerator::Generate(const FileDescriptor *file, - [[maybe_unused]] const std::string ¶meter, - GeneratorContext *generatorContext, -- std::string *error) const -+ [[maybe_unused]] std::string *error) const - { - assert(file != nullptr && generatorContext != nullptr); - -- if (file->syntax() != FileDescriptor::SYNTAX_PROTO3) { -- *error = "Invalid proto used. qtprotobufgen only supports 'proto3' syntax"; -- return false; -- } -- - return GenerateMessages(file, generatorContext); - } - diff --git a/libraries/qt6/profile.d/qt6.csh b/libraries/qt6/profile.d/qt6.csh deleted file mode 100644 index 7764724e0d..0000000000 --- a/libraries/qt6/profile.d/qt6.csh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/csh -# Environment path variables for the Qt package: -if ( ! $?QT6DIR ) then - # It's best to use the generic directory to avoid - # compiling in a version-containing path: - if ( -d /usr/lib@LIBDIRSUFFIX@/qt6 ) then - setenv QT6DIR /usr/lib@LIBDIRSUFFIX@/qt6 - else - # Find the newest Qt directory and set $QT6DIR to that: - foreach qtd ( /usr/lib@LIBDIRSUFFIX@/qt6-* ) - if ( -d $qtd ) then - setenv QT6DIR $qtd - endif - end - endif -endif -set path = ( $path $QT6DIR/bin ) diff --git a/libraries/qt6/profile.d/qt6.sh b/libraries/qt6/profile.d/qt6.sh deleted file mode 100644 index 70ccbc2faf..0000000000 --- a/libraries/qt6/profile.d/qt6.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Environment variables for the Qt package. -# -# It's best to use the generic directory to avoid -# compiling in a version-containing path: -if [ -d /usr/lib@LIBDIRSUFFIX@/qt6 ]; then - QT6DIR=/usr/lib@LIBDIRSUFFIX@/qt6 -else - # Find the newest Qt directory and set $QT6DIR to that: - for qtd in /usr/lib@LIBDIRSUFFIX@/qt6-* ; do - if [ -d $qtd ]; then - QT6DIR=$qtd - fi - done -fi -PATH="$PATH:$QT6DIR/bin" -export QT6DIR diff --git a/libraries/qt6/qt6.SlackBuild b/libraries/qt6/qt6.SlackBuild deleted file mode 100644 index 92997fc905..0000000000 --- a/libraries/qt6/qt6.SlackBuild +++ /dev/null @@ -1,197 +0,0 @@ -#!/bin/bash - -# Slackware build script for qt6 - -# Copyright 2022-2023 Steven Voges -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=qt6 -SRCNAM=qt-everywhere-src -VERSION=${VERSION:-6.5.2} -BSCLANG=libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64 -CCACHE=${CCACHE:-OFF} -EXAMPLES=${EXAMPLES:-OFF} -LINKED_OPENSSL=${LINKED_OPENSSL:-ON} -PROPRIETARY_CODECS=${PROPRIETARY_CODECS:-OFF} -SYSTEM_FFMPEG=${SYSTEM_FFMPEG:-ON} -SYSTEM_HARFBUZZ=${SYSTEM_HARFBUZZ:-OFF} #Link against qt6's harfbuzz because Slackware 15.0's package is too old -SYSTEM_SQLITE=${SYSTEM_SQLITE:-ON} -SYSTEM_XCB_INPUT=${SYSTEM_XCB_INPUT:-ON} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-$VERSION -bsdtar xvf $CWD/$BSCLANG.7z -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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/newer_protobuf_1.patch -patch -p1 < $CWD/newer_protobuf_2.patch - -#Fix compile on -current/gcc13+ -sed -i '54i #include ' qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp - -export CC=clang -export CXX=clang++ -export CFLAGS="$SLKCFLAGS" - -mkdir -p build -cd build - cmake \ - -G Ninja \ - -Wno-dev \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DClang_DIR=$TMP/$SRCNAM-$VERSION/libclang/lib/cmake/clang \ - -DFEATURE_openssl_linked=$LINKED_OPENSSL \ - -DFEATURE_system_harfbuzz=$SYSTEM_HARFBUZZ \ - -DFEATURE_system_sqlite=$SYSTEM_SQLITE \ - -DFEATURE_system_xcb_xinput=$SYSTEM_XCB_INPUT \ - -DFEATURE_webengine_proprietary_codecs=$PROPRIETARY_CODECS \ - -DFEATURE_webengine_system_ffmpeg=$SYSTEM_FFMPEG \ - -DFEATURE_webengine_system_re2=OFF \ - -DINSTALL_ARCHDATADIR=./lib${LIBDIRSUFFIX} \ - -DINSTALL_BINDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/bin \ - -DINSTALL_DESCRIPTIONSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/modules \ - -DINSTALL_DOCDIR=./doc/$PRGNAM-$VERSION \ - -DINSTALL_EXAMPLESDIR=./doc/$PRGNAM-$VERSION/examples \ - -DINSTALL_INCLUDEDIR=./include/$PRGNAM \ - -DINSTALL_LIBDIR=./lib${LIBDIRSUFFIX} \ - -DINSTALL_LIBEXECDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/libexec \ - -DINSTALL_MKSPECSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/mkspecs \ - -DINSTALL_PLUGINSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/plugins \ - -DINSTALL_QMLDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/qml \ - -DINSTALL_TRANSLATIONSDIR=./share/$PRGNAM/translations \ - -DINSTALL_TESTSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/tests \ - -DQT_BUILD_EXAMPLES=$EXAMPLES \ - -DQT_USE_CCACHE=$CCACHE \ - -DCMAKE_BUILD_TYPE=Release .. - cmake --build . - DESTDIR=$PKG cmake --install . --strip -cd .. - -rm -R $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/QtBuildInternals -rmdir $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/ios -rmdir $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/macos - -if [ -d "$PKG/usr/phrasebooks" ]; then - mv $PKG/usr/phrasebooks $PKG/usr/share/$PRGNAM/ -fi -if [ -d "$PKG/usr/resources" ]; then - mv $PKG/usr/resources $PKG/usr/share/$PRGNAM/ -fi - -if [ "$EXAMPLES" = "ON" ]; then - find -L $PKG/usr/doc/$PRGNAM-$VERSION/examples \ - -type d -exec chmod 755 {} \; - find -L $PKG/usr/doc/$PRGNAM-$VERSION/examples \ - -type f -exec chmod 644 {} \; -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 - -for i in $CWD/desktop/*.desktop; do - install -D -m 0644 $i $PKG/usr/share/applications/$(basename $i) -done -sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/* - -# Install symlinks to the Qt6 binaries in the $PATH (avoid the ones already ending in "6" or "cmake"): -mkdir -p $PKG/usr/bin -for FILE in $PKG/usr/lib${LIBDIRSUFFIX}/qt6/bin/* ; do - if ! [[ $FILE =~ (6$|cmake$) ]]; then - ln -s ../lib${LIBDIRSUFFIX}/qt6/bin/$(basename $FILE) $PKG/usr/bin/$(basename $FILE)-qt6 - fi -done - -install -D -m 0644 qttools/src/assistant/assistant/images/assistant-128.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/assistant-qt6.png -install -D -m 0644 qttools/src/designer/src/designer/images/designer.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/designer-qt6.png -install -D -m 0644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt6.png -install -D -m 0644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/linguist-qt6.png - -mkdir -p $PKG/etc/profile.d -sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.sh \ - > $PKG/etc/profile.d/$PRGNAM.sh -sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.csh \ - > $PKG/etc/profile.d/$PRGNAM.csh -chmod 0755 $PKG/etc/profile.d/* - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - .QT-ENTERPRISE-LICENSE-AGREEMENT LICENSE.* README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/qt6/qt6.info b/libraries/qt6/qt6.info deleted file mode 100644 index 5996f1a317..0000000000 --- a/libraries/qt6/qt6.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="qt6" -VERSION="6.5.2" -HOMEPAGE="https://qt.io" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.5/6.5.2/single/qt-everywhere-src-6.5.2.tar.xz \ - https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" -MD5SUM_x86_64="87f56fd8aedd2e429047c40397e9be48 \ - 1eb94ba35df4aa217cf485086215182a" -REQUIRES="double-conversion html5lib md4c nodejs" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/qt6/slack-desc b/libraries/qt6/slack-desc deleted file mode 100644 index 32c3c86424..0000000000 --- a/libraries/qt6/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -qt6: qt6 (Application Development Framework) -qt6: -qt6: Qt is a cross-platform application development framework for desktop, -qt6: embedded and mobile. Supported Platforms include Linux, OS X, -qt6: Windows, VxWorks, QNX, Android, iOS, BlackBerry, Sailfish OS and -qt6: others. -qt6: -qt6: Homepage: https://qt.io -qt6: -qt6: -qt6: diff --git a/libraries/qtermwidget/qtermwidget.SlackBuild b/libraries/qtermwidget/qtermwidget.SlackBuild index 6321e21551..d855e61256 100644 --- a/libraries/qtermwidget/qtermwidget.SlackBuild +++ b/libraries/qtermwidget/qtermwidget.SlackBuild @@ -87,6 +87,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/quesoglc/quesoglc.SlackBuild b/libraries/quesoglc/quesoglc.SlackBuild index 959f25c2c3..595f180d43 100644 --- a/libraries/quesoglc/quesoglc.SlackBuild +++ b/libraries/quesoglc/quesoglc.SlackBuild @@ -78,7 +78,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 -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/range-v3/range-v3.SlackBuild b/libraries/range-v3/range-v3.SlackBuild index 65fd7ec15f..234f41a13f 100644 --- a/libraries/range-v3/range-v3.SlackBuild +++ b/libraries/range-v3/range-v3.SlackBuild @@ -87,6 +87,10 @@ cd build -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=ON \ + -DRANGE_V3_TESTS=OFF \ + -DRANGE_V3_HEADER_CHECKS=OFF \ + -DRANGE_V3_EXAMPLES=OFF \ + -DRANGE_V3_PERF=OFF \ .. make diff --git a/libraries/rapidjson/rapidjson.SlackBuild b/libraries/rapidjson/rapidjson.SlackBuild index 5f6f1c6aab..2df97325e7 100644 --- a/libraries/rapidjson/rapidjson.SlackBuild +++ b/libraries/rapidjson/rapidjson.SlackBuild @@ -99,6 +99,7 @@ cd build -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ -DDOC_INSTALL_DIR=/usr/doc/$PRGNAM-$VERSION \ -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/rrdtool/rrdtool.SlackBuild b/libraries/rrdtool/rrdtool.SlackBuild index 222235f121..a82f942b7e 100644 --- a/libraries/rrdtool/rrdtool.SlackBuild +++ b/libraries/rrdtool/rrdtool.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rrdtool -VERSION=${VERSION:-1.8.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.9.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/rrdtool/rrdtool.info b/libraries/rrdtool/rrdtool.info index 79c13dd956..63bc9235ec 100644 --- a/libraries/rrdtool/rrdtool.info +++ b/libraries/rrdtool/rrdtool.info @@ -1,8 +1,8 @@ PRGNAM="rrdtool" -VERSION="1.8.0" +VERSION="1.9.0" HOMEPAGE="https://www.rrdtool.org/" -DOWNLOAD="https://github.com/oetiker/rrdtool-1.x/releases/download/v1.8.0/rrdtool-1.8.0.tar.gz" -MD5SUM="852754364cbd0703a099b5eb32932851" +DOWNLOAD="https://github.com/oetiker/rrdtool-1.x/releases/download/v1.9.0/rrdtool-1.9.0.tar.gz" +MD5SUM="bcbdb069e74fc866fb92deb6697c5392" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/seatd/README b/libraries/seatd/README deleted file mode 100644 index 1a38c14fca..0000000000 --- a/libraries/seatd/README +++ /dev/null @@ -1,16 +0,0 @@ -seatd is a seat management daemon, that does everything it needs to -do. Nothing more, nothing less. Depends only on libc. - -libseat is a seat management library allowing applications to use -whatever seat management is available. - -Supports: -- seatd -- (e)logind -- embedded seatd for standalone operation - -Each backend can be compile-time included and is runtime auto-detected -or manually selected with the `LIBSEAT_BACKEND` environment variable. - -Which backend is in use is transparent to the application, providing a -simple common interface. diff --git a/libraries/seatd/seatd.SlackBuild b/libraries/seatd/seatd.SlackBuild deleted file mode 100644 index 7461861fa2..0000000000 --- a/libraries/seatd/seatd.SlackBuild +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/bash - -# Slackware build script for seatd - -# Copyright 2022 Damian Perticone Berisso,Argentina -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=seatd -VERSION=${VERSION:-0.6.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dstrip=true \ - -Dlibseat-logind=elogind \ - -Dlibseat-seatd=enabled \ - -Dlibseat-builtin=disabled \ - -Dserver=enabled \ - -Dman-pages=enabled \ - - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -find $PKG -name perllocal.pod \ - -o -name ".packlist" \ - -o -name "*.bs" \ - | xargs rm -f - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/seatd/seatd.info b/libraries/seatd/seatd.info deleted file mode 100644 index 331c0897a0..0000000000 --- a/libraries/seatd/seatd.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="seatd" -VERSION="0.6.4" -HOMEPAGE="https://sr.ht/~kennylevinsen/seatd/" -DOWNLOAD="https://git.sr.ht/~kennylevinsen/seatd/archive/0.6.4.tar.gz" -MD5SUM="114604a0b346a40157839d5c8c8b2ce2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="scdoc" -MAINTAINER="Damian Perticone" -EMAIL="mjolnirdam@gmail.com" diff --git a/libraries/seatd/slack-desc b/libraries/seatd/slack-desc deleted file mode 100644 index acda835b90..0000000000 --- a/libraries/seatd/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -seatd: seatd (universal seat management library and daemon) -seatd: -seatd: A minimal seat management daemon, and a universal -seatd: seat management library. -seatd: Supports: seatd, elogind, embedded seatd for standalone operation -seatd: -seatd: Homepage: https://sr.ht/~kennylevinsen/seatd/ -seatd: -seatd: -seatd: -seatd: diff --git a/libraries/spdlog/README b/libraries/spdlog/README index 3759669027..d160ef865c 100644 --- a/libraries/spdlog/README +++ b/libraries/spdlog/README @@ -3,5 +3,5 @@ Very fast, header-only/compiled, C++ logging library. fmt is an optional dependency and will be autodetected if installed. This scripts builds both 32bit and 64bit libraries by autodetecting -multilib. If you are on a multilib system and only wish to build the -64bit library, pass COMPAT32=no to the build script. +multilib and if you pass COMPAT32=yes to the build script (this +needs a 32bit fmt installed in your system) diff --git a/libraries/spdlog/spdlog.SlackBuild b/libraries/spdlog/spdlog.SlackBuild index b94c82e6cb..ca9dc79e3c 100644 --- a/libraries/spdlog/spdlog.SlackBuild +++ b/libraries/spdlog/spdlog.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=spdlog -VERSION=${VERSION:-1.14.1} +VERSION=${VERSION:-1.15.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -63,12 +63,13 @@ else LIBDIRSUFFIX="" fi -#Test for multilib -COMPAT32=${COMPAT32@L} -COMPATTMP="$( mktemp -d $TMP/compat32-test-XXXXXX )" -echo "int main(void) {; return(0); }" > "$COMPATTMP/test.c" -gcc -m32 "$COMPATTMP/test.c" -o /dev/null >/dev/null 2>&1 \ - && COMPAT32=${COMPAT32:-yes} +# Test for multilib +COMPAT32=${COMPAT32:-no} +if [ "$ARCH" = "x86_64" && "$COMPAT32" = "yes" ]; then + COMPATTMP="$( mktemp -d $TMP/compat32-test-XXXXXX )" + echo "int main(void) {; return(0); }" > "$COMPATTMP/test.c" + gcc -m32 "$COMPATTMP/test.c" -o /dev/null >/dev/null 2>&1 && COMPAT32=yes +fi rm -rf "$COMPATTMP" set -e @@ -96,7 +97,7 @@ cd build -DSPDLOG_BUILD_TESTS=ON \ -DSPDLOG_BUILD_BENCH=OFF \ -DSPDLOG_BUILD_EXAMPLE=OFF \ - -DSPDLOG_FMT_EXTERNAL=OFF \ + -DSPDLOG_FMT_EXTERNAL=ON \ -DCMAKE_SKIP_RPATH=TRUE \ -DCMAKE_BUILD_TYPE=Release .. make @@ -115,7 +116,7 @@ if [ "$COMPAT32" = "yes" ]; then -DSPDLOG_BUILD_TESTS=ON \ -DSPDLOG_BUILD_BENCH=OFF \ -DSPDLOG_BUILD_EXAMPLE=OFF \ - -DSPDLOG_FMT_EXTERNAL=OFF \ + -DSPDLOG_FMT_EXTERNAL=ON \ -DCMAKE_SKIP_RPATH=TRUE \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/libraries/spdlog/spdlog.info b/libraries/spdlog/spdlog.info index e4584a4019..36f6e9d384 100644 --- a/libraries/spdlog/spdlog.info +++ b/libraries/spdlog/spdlog.info @@ -1,10 +1,10 @@ PRGNAM="spdlog" -VERSION="1.14.1" +VERSION="1.15.3" HOMEPAGE="https://github.com/gabime/spdlog" -DOWNLOAD="https://github.com/gabime/spdlog/archive/v1.14.1/spdlog-1.14.1.tar.gz" -MD5SUM="f2c3f15c20e67b261836ff7bfda302cf" +DOWNLOAD="https://github.com/gabime/spdlog/archive/v1.15.3/spdlog-1.15.3.tar.gz" +MD5SUM="fffda902bb4a04ce814ddd5328d95e8a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="Catch2 fmt" +REQUIRES="Catch2" MAINTAINER="Steven Voges" EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/srt/srt.SlackBuild b/libraries/srt/srt.SlackBuild index 4be4eb6e3e..d3050a509f 100644 --- a/libraries/srt/srt.SlackBuild +++ b/libraries/srt/srt.SlackBuild @@ -89,7 +89,8 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --cmake_install_libdir=/usr/lib${LIBDIRSUFFIX} \ --cmake_install_bindir=/usr/bin \ - --cmake_install_includedir=/usr/include + --cmake_install_includedir=/usr/include \ + --cmake_policy_version_minimum=3.5 make diff --git a/libraries/stfl/stfl.SlackBuild b/libraries/stfl/stfl.SlackBuild index e5edb31bb2..f41ffbff10 100644 --- a/libraries/stfl/stfl.SlackBuild +++ b/libraries/stfl/stfl.SlackBuild @@ -67,6 +67,7 @@ patch -p1 < $CWD/allow-custom-opts-in-Makefile.patch # Add proper Python 2/3 support cp -r python python3 patch -p1 < $CWD/python-support.patch +sed -i 's|ncursesw/ncurses.h|ncurses.h|' stfl_internals.h make install \ OPTS="$SLKCFLAGS" \ diff --git a/libraries/tbb/tbb.SlackBuild b/libraries/tbb/tbb.SlackBuild index 7f3e3eecab..bfe01b1756 100644 --- a/libraries/tbb/tbb.SlackBuild +++ b/libraries/tbb/tbb.SlackBuild @@ -63,6 +63,7 @@ cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DTBB_TEST=OFF \ diff --git a/libraries/tkimg/tkimg.SlackBuild b/libraries/tkimg/tkimg.SlackBuild index 0e55fd2a13..6135a84b8f 100644 --- a/libraries/tkimg/tkimg.SlackBuild +++ b/libraries/tkimg/tkimg.SlackBuild @@ -25,9 +25,10 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tkimg -VERSION=${VERSION:-1.4.2} +SRCNAM=Img +VERSION=${VERSION:-1.4.16} MAJVER=1.4 -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -70,9 +68,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM$MAJVER -tar xvf $CWD/$PRGNAM$VERSION.tar.bz2 -cd $PRGNAM$MAJVER +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION-Source.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 \ @@ -80,7 +78,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 {} \; -make distclean # Disable JBIG support (if left enabled then the build will fail with a # link error for JBIG iff the Slackbuilds jbigkit is already installed # before building tkimg). Note that the result is no JBIG support, but diff --git a/libraries/tkimg/tkimg.info b/libraries/tkimg/tkimg.info index 7d7d383e6a..82f69a8378 100644 --- a/libraries/tkimg/tkimg.info +++ b/libraries/tkimg/tkimg.info @@ -1,8 +1,8 @@ PRGNAM="tkimg" -VERSION="1.4.2" +VERSION="1.4.16" HOMEPAGE="http://wiki.tcl.tk/1404" -DOWNLOAD="http://download.sourceforge.net/tkimg/tkimg1.4.2.tar.bz2" -MD5SUM="1ccae906cb1c235b114b9736dfb157d6" +DOWNLOAD="http://download.sourceforge.net/tkimg/Img-1.4.16-Source.tar.gz" +MD5SUM="88e74d5b41706d4d97cd0e428ca58979" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="tcllib" diff --git a/libraries/tree-sitter/README b/libraries/tree-sitter/README deleted file mode 100644 index 55e7321e7f..0000000000 --- a/libraries/tree-sitter/README +++ /dev/null @@ -1,4 +0,0 @@ -Tree-sitter is a parser generator tool and an incremental -parsing library. It can build a concrete syntax tree for a -source file and efficiently update the syntax tree as the -source file is edited. diff --git a/libraries/tree-sitter/slack-desc b/libraries/tree-sitter/slack-desc deleted file mode 100644 index a9210f6f2f..0000000000 --- a/libraries/tree-sitter/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -tree-sitter: tree-sitter (parser generator) -tree-sitter: -tree-sitter: Tree-sitter is a parser generator tool and an incremental parsing -tree-sitter: library. It can build a concrete syntax tree for a source file and -tree-sitter: efficiently update the syntax tree as the source file is edited. -tree-sitter: -tree-sitter: -tree-sitter: -tree-sitter: -tree-sitter: -tree-sitter: https://github.com/tree-sitter/tree-sitter diff --git a/libraries/tree-sitter/tree-sitter.SlackBuild b/libraries/tree-sitter/tree-sitter.SlackBuild deleted file mode 100644 index 53b75be194..0000000000 --- a/libraries/tree-sitter/tree-sitter.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash - -# Slackware build script for tree-sitter - -# Copyright 2020 Julian Grinblat -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=tree-sitter -VERSION=${VERSION:-0.26.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 {} \; - -export CFLAGS+="$SLKCFLAGS" -make -make install DESTDIR=$PKG PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# remove static library -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libtree-sitter.a - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/tree-sitter/tree-sitter.info b/libraries/tree-sitter/tree-sitter.info deleted file mode 100644 index 3bc388a39a..0000000000 --- a/libraries/tree-sitter/tree-sitter.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="tree-sitter" -VERSION="0.26.0" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter" -DOWNLOAD="https://github.com/tree-sitter/tree-sitter/archive/v0.26.0/tree-sitter-0.26.0.tar.gz" -MD5SUM="e5fe37cc4b7b09183910625eca431137" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Julian Grinblat" -EMAIL="julian@dotcore.co.il" diff --git a/libraries/tsocks/tsocks.SlackBuild b/libraries/tsocks/tsocks.SlackBuild index 1c0d9102d4..ce472b8bea 100644 --- a/libraries/tsocks/tsocks.SlackBuild +++ b/libraries/tsocks/tsocks.SlackBuild @@ -86,7 +86,7 @@ if [ "$ARCH" = "x86_64" ]; then patch -p1 --verbose < $CWD/tsocks-1.8beta5-64bit.diff || exit 1 fi -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=c89" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/unarr/unarr.SlackBuild b/libraries/unarr/unarr.SlackBuild index 160ee1a82b..85b86585ea 100644 --- a/libraries/unarr/unarr.SlackBuild +++ b/libraries/unarr/unarr.SlackBuild @@ -81,7 +81,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 {} \; -cmake ./ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX +cmake ./ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX -DCMAKE_POLICY_VERSION_MINIMUM=3.5 make make install DESTDIR=$PKG diff --git a/libraries/vigra/README b/libraries/vigra/README index 4992a5ce61..d2300ecfc4 100644 --- a/libraries/vigra/README +++ b/libraries/vigra/README @@ -2,4 +2,4 @@ VIGRA stands for "Vision with Generic Algorithms". It is a novel computer vision library that puts its main emphasis on customizable algorithms and data structures. -Optional dependencies: nose, numpy, Sphinx +Optional dependencies: nose, hdf5 diff --git a/libraries/vigra/vigra.SlackBuild b/libraries/vigra/vigra.SlackBuild index d55250fb95..5fa54ad3fc 100644 --- a/libraries/vigra/vigra.SlackBuild +++ b/libraries/vigra/vigra.SlackBuild @@ -31,8 +31,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="vigra" -VERSION=${VERSION:-1.11.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.12.2} +SRCVER=Version-$(echo $VERSION | tr . - ) +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,11 +73,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$SRCVER +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$SRCVER chown -R root:root . - find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \+ -o \ @@ -91,6 +91,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DWITH_OPENEXR=true \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/vigra/vigra.info b/libraries/vigra/vigra.info index 74ac5c8dc1..00bab70b60 100644 --- a/libraries/vigra/vigra.info +++ b/libraries/vigra/vigra.info @@ -1,8 +1,8 @@ PRGNAM="vigra" -VERSION="1.11.1" +VERSION="1.12.2" HOMEPAGE="http://ukoethe.github.io/vigra/" -DOWNLOAD="https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz" -MD5SUM="e72faf9fb82fa71fa63ba064bb63b703" +DOWNLOAD="https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-2/vigra-1.12.2.tar.gz" +MD5SUM="1031c61fe7b5b326664fe0bcaec4c158" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/volk/volk.SlackBuild b/libraries/volk/volk.SlackBuild index 19b913438d..53ceb8c48c 100644 --- a/libraries/volk/volk.SlackBuild +++ b/libraries/volk/volk.SlackBuild @@ -88,6 +88,7 @@ cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ diff --git a/libraries/wcslib/README b/libraries/wcslib/README deleted file mode 100644 index 8ea64be5d9..0000000000 --- a/libraries/wcslib/README +++ /dev/null @@ -1,11 +0,0 @@ -WCSLIB is a set of C library routines that implements the World -Coordinate System (WCS) standard in FITS (Flexible Image Transport -System). It comes with support for FORTRAN via a set of wrapper -functions. It also includes a general curvilinear axis drawing -routine, PGSBOX, for PGPLOT. Another included utility program is -HPXcvt, which is used to convert 1D HEALPix pixelization data stored -in a variety of forms in FITS into a 2D primary image array with HPX -or XPH coordinate representation. - -Usage with gcc compiler: use "-lwcs" command line argument for linking -at compile time. diff --git a/libraries/wcslib/slack-desc b/libraries/wcslib/slack-desc deleted file mode 100644 index 2051c37450..0000000000 --- a/libraries/wcslib/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -wcslib: wcslib (World Coordinate System for FITS) -wcslib: -wcslib: WCSLIB is a C library, supplied with a full set of Fortran wrappers, -wcslib: that implements the World Coordinate System (WCS) standard in FITS -wcslib: (Flexible Image Transport System). It also includes a PGPLOT-based -wcslib: routine, PGSBOX, for drawing general curvilinear coordinate -wcslib: graticules and a number of utility programs. -wcslib: -wcslib: -wcslib: Homepage: http://www.atnf.csiro.au/people/mcalabre/WCS/ -wcslib: diff --git a/libraries/wcslib/wcslib.SlackBuild b/libraries/wcslib/wcslib.SlackBuild deleted file mode 100644 index 39bedd2854..0000000000 --- a/libraries/wcslib/wcslib.SlackBuild +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/bash - -# Slackware build script for WCSLib - -# Copyright 2018 Nitish Ragoomundun, Mauritius -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20220419 bkw: Modified by SlackBuilds.org, BUILD=3: -# - fix dir permissions in package (e.g. usr/man was 0775). -# - get rid of static lib. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=wcslib -VERSION=${VERSION:-8.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 . -type f -exec chmod 0644 {} \+ -find . -type d -exec chmod 0755 {} \+ - -# Paths for PGPLOT in case it is not set properly -#PGPLOT_DIR="/usr/lib${LIBDIRSUFFIX}/pgplot" -#LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib${LIBDIRSUFFIX}/pgplot" - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -sh ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-cfitsio \ - --with-cfitsiolib=/usr/lib${LIBDIRSUFFIX} \ - --with-cfitsioinc=/usr/include \ - --with-x \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG -gzip -9 $PKG/usr/man/man*/* - -# 20220419 bkw: --disable-static accepted and ignored, so: -rm -f $PKG/usr/lib*/*.a - -# Give root write permission on regular files as many of them get 444 -# permissions by default. -# 20220419 bkw: also, a lot of the directories are 775. -find $PKG -type f -exec chmod u+w {} \+ -find $PKG -type d -exec chmod 0755 {} \+ - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/wcslib/wcslib.info b/libraries/wcslib/wcslib.info deleted file mode 100644 index 4aa6982539..0000000000 --- a/libraries/wcslib/wcslib.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wcslib" -VERSION="8.4" -HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/" -DOWNLOAD="ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-8.4.tar.bz2" -MD5SUM="580f1e258ef66c6d5cb417cd4653d37d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@linuxgalaxy.org" diff --git a/libraries/wlroots/README b/libraries/wlroots/README deleted file mode 100644 index 5d3d097da9..0000000000 --- a/libraries/wlroots/README +++ /dev/null @@ -1,19 +0,0 @@ -Wlroots is modular Wayland compositor library, -it provides backends that abstract the underlying display -and input hardware, including KMS/DRM, libinput, Wayland, -X11, and headless backends, plus any custom backends you -choose to write, which can all be created or destroyed at -runtime and used in concert with each other. -wlroots provides unopinionated, mostly standalone implementations of -many Wayland interfaces, both from wayland.xml and various protocol -extensions. - -Wlroots provides several powerful, standalone, and optional tools that -implement components common to many compositors, such as -the arrangement of outputs in physical space. -Provides an Xwayland abstraction that allows you to have excellent -Xwayland support without worrying about writing your own X11 window -manager on top of writing your compositor. -Wlroots provides a renderer abstraction that simple compositors can use -to avoid writing GL code directly, but which steps out of the way when -your needs demand custom rendering code. diff --git a/libraries/wlroots/slack-desc b/libraries/wlroots/slack-desc deleted file mode 100644 index 388f8257e5..0000000000 --- a/libraries/wlroots/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -wlroots: wlroots (wayland compositor library) -wlroots: -wlroots: Wlroots is a modular wayland compositor library. -wlroots: -wlroots: -wlroots: -wlroots: Home: https://gitlab.freedesktop.org/wlroots/wlroots/ -wlroots: -wlroots: -wlroots: -wlroots: diff --git a/libraries/wlroots/wlroots.SlackBuild b/libraries/wlroots/wlroots.SlackBuild deleted file mode 100644 index 767fb8a872..0000000000 --- a/libraries/wlroots/wlroots.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# Slackware build script for wlroots - -# Copyright 2022 Damian Perticone Berisso,Argentina -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=wlroots -VERSION=${VERSION:-0.15.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dstrip=true \ - -Dxcb-errors=disabled \ - -Dexamples=false \ - -Drenderers=auto \ - -Dxwayland=enabled \ - -Dbackends=drm,libinput,x11 - - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod \ - -o -name ".packlist" \ - -o -name "*.bs" \ - | xargs rm -f - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CONTRIBUTING.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/wlroots/wlroots.info b/libraries/wlroots/wlroots.info deleted file mode 100644 index 2e57c86c6e..0000000000 --- a/libraries/wlroots/wlroots.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wlroots" -VERSION="0.15.1" -HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots" -DOWNLOAD="https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/0.15.1/wlroots-0.15.1.tar.gz" -MD5SUM="d847f52dd4be602918fdfa25e00aef27" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="seatd" -MAINTAINER="Damian Perticone" -EMAIL="mjolnirdam@gmail.com" diff --git a/libraries/wpebackend-fdo/wpebackend-fdo.SlackBuild b/libraries/wpebackend-fdo/wpebackend-fdo.SlackBuild index 44c8baad1e..7779e8866b 100644 --- a/libraries/wpebackend-fdo/wpebackend-fdo.SlackBuild +++ b/libraries/wpebackend-fdo/wpebackend-fdo.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wpebackend-fdo -# Copyright 2020-2023 Matteo Bernardini +# Copyright 2020-2025 Matteo Bernardini # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wpebackend-fdo -VERSION=${VERSION:-1.14.2} +VERSION=${VERSION:-1.16.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/libraries/wpebackend-fdo/wpebackend-fdo.info b/libraries/wpebackend-fdo/wpebackend-fdo.info index 651dab469f..36b0ccbacf 100644 --- a/libraries/wpebackend-fdo/wpebackend-fdo.info +++ b/libraries/wpebackend-fdo/wpebackend-fdo.info @@ -1,8 +1,8 @@ PRGNAM="wpebackend-fdo" -VERSION="1.14.2" +VERSION="1.16.0" HOMEPAGE="https://wpewebkit.org" -DOWNLOAD="https://wpewebkit.org/releases/wpebackend-fdo-1.14.2.tar.xz" -MD5SUM="dafd899646b2e31ef2d97938a638c48d" +DOWNLOAD="https://wpewebkit.org/releases/wpebackend-fdo-1.16.0.tar.xz" +MD5SUM="38f488aaa6d68252b593b65ba3e2d9d1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libwpe" diff --git a/libraries/wxWidgets/wxWidgets.SlackBuild b/libraries/wxWidgets/wxWidgets.SlackBuild index a220401d2b..c7d73ce7c4 100644 --- a/libraries/wxWidgets/wxWidgets.SlackBuild +++ b/libraries/wxWidgets/wxWidgets.SlackBuild @@ -105,6 +105,7 @@ cmake -B build-gtk3 \ -DwxUSE_WEBVIEW_WEBKIT=ON \ -DwxUSE_WEBVIEW=ON \ -DwxUSE_PRIVATE_FONTS=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release . cmake --build build-gtk3 DESTDIR="$PKG" cmake --install build-gtk3 @@ -129,6 +130,7 @@ cmake -B build-qt5 \ -DwxUSE_WEBVIEW_WEBKIT=ON \ -DwxUSE_WEBVIEW=ON \ -DwxUSE_PRIVATE_FONTS=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release . cmake --build build-qt5 DESTDIR="$PKG" cmake --install build-qt5 diff --git a/libraries/wxsvg/gcc13.patch b/libraries/wxsvg/gcc13.patch deleted file mode 100644 index fdc57958dd..0000000000 --- a/libraries/wxsvg/gcc13.patch +++ /dev/null @@ -1,31 +0,0 @@ -From https://gcc.gnu.org/gcc-13/porting_to.html - -Some C++ Standard Library headers have been changed to no longer -include other headers that were being used internally by the library. -As such, C++ programs that used standard library components without -including the right headers will no longer compile. - -The following headers are used less widely in libstdc++ and may need -to be included explicitly when compiling with GCC 13: - - (for std::string, std::to_string, std::stoi etc.) - (for std::error_code, std::error_category, std::system_error). - (for std::int8_t, std::int32_t etc.) - (for std::printf, std::fopen etc.) - (for std::strtol, std::malloc etc.) - -- - -Matteo Bernardini - -diff -Naur wxsvg-1.5.24.orig/src/cairo/SVGCanvasCairo.cpp wxsvg-1.5.24/src/cairo/SVGCanvasCairo.cpp ---- wxsvg-1.5.24.orig/src/cairo/SVGCanvasCairo.cpp 2022-08-31 16:56:26.000000000 +0200 -+++ wxsvg-1.5.24/src/cairo/SVGCanvasCairo.cpp 2023-04-27 22:23:05.069420000 +0200 -@@ -14,6 +14,7 @@ - #include "SVGCanvasImageCairo.h" - #include - #include -+#include - - wxSVGCanvasCairo::~wxSVGCanvasCairo() { - Destroy(); diff --git a/libraries/wxsvg/wxsvg.SlackBuild b/libraries/wxsvg/wxsvg.SlackBuild index 3f09fe593d..f17e9f7a0f 100644 --- a/libraries/wxsvg/wxsvg.SlackBuild +++ b/libraries/wxsvg/wxsvg.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wxsvg -# Copyright 2013-2022 Matteo Bernardini , Pisa, Italy +# Copyright 2013-2024 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wxsvg -VERSION=${VERSION:-1.5.24} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.5.25} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -79,9 +76,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/gcc13.patch - -sh autogen.sh || true +sed -i 's/libwxsvg_la_LDFLAGS = /libwxsvg_la_LDFLAGS = $(LDFLAGS) /' src/Makefile.am +autoreconf -fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -96,6 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-shared \ --build=$ARCH-slackware-linux +sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make make install DESTDIR=$PKG diff --git a/libraries/wxsvg/wxsvg.info b/libraries/wxsvg/wxsvg.info index 338ea9ccb4..e90228d7eb 100644 --- a/libraries/wxsvg/wxsvg.info +++ b/libraries/wxsvg/wxsvg.info @@ -1,8 +1,8 @@ PRGNAM="wxsvg" -VERSION="1.5.24" +VERSION="1.5.25" HOMEPAGE="https://sourceforge.net/projects/wxsvg/" -DOWNLOAD="https://downloads.sf.net/wxsvg/wxsvg-1.5.24.tar.bz2" -MD5SUM="4f6780ef38bed0f7a7b6bb8d6499f405" +DOWNLOAD="https://downloads.sf.net/wxsvg/wxsvg-1.5.25.tar.bz2" +MD5SUM="1fe9e2fa330fccefb8b6149aafef5bf0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxWidgets" diff --git a/libraries/xbyak/xbyak.SlackBuild b/libraries/xbyak/xbyak.SlackBuild index da9822bcdb..f93fb20985 100644 --- a/libraries/xbyak/xbyak.SlackBuild +++ b/libraries/xbyak/xbyak.SlackBuild @@ -81,6 +81,7 @@ cd build cmake \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/yajl/patches/0009-cmake4.patch b/libraries/yajl/patches/0009-cmake4.patch new file mode 100644 index 0000000000..bd8b6cbe06 --- /dev/null +++ b/libraries/yajl/patches/0009-cmake4.patch @@ -0,0 +1,66 @@ +From 6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 28 Mar 2025 09:31:40 +0000 +Subject: [PATCH] Allow build with CMake 4.0.0 + +fixes deprecated cmake option and uses cmake 2.8.0 TARGET_FILE +update cmake supported minimum versions to 2.8.0...3.10 + +ref: +- https://cmake.org/cmake/help/latest/policy/CMP0026.html + +CMake Error at .../CMakeLists.txt: (GET_TARGET_PROPERTY): + The LOCATION property may not be read from target "json_...". Use the + target name directly with add_custom_command, or use the generator + expression $, as appropriate. + +Signed-off-by: Rudi Heitbaum +--- + CMakeLists.txt | 2 +- + reformatter/CMakeLists.txt | 4 +--- + verify/CMakeLists.txt | 4 +--- + 3 files changed, 3 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 471eee13..deba3a40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,7 +12,7 @@ + # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0...3.10) + + PROJECT(YetAnotherJSONParser C) + +diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt +index 52a9bee8..267d02e2 100644 +--- a/reformatter/CMakeLists.txt ++++ b/reformatter/CMakeLists.txt +@@ -35,9 +35,7 @@ IF (NOT WIN32) + ENDIF (NOT WIN32) + + # copy the binary into the output directory +-GET_TARGET_PROPERTY(binPath json_reformat LOCATION) +- + ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${binDir}) + + INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin) +diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt +index 967fca16..2f390082 100644 +--- a/verify/CMakeLists.txt ++++ b/verify/CMakeLists.txt +@@ -29,9 +29,7 @@ ADD_EXECUTABLE(json_verify ${SRCS}) + TARGET_LINK_LIBRARIES(json_verify yajl_s) + + # copy in the binary +-GET_TARGET_PROPERTY(binPath json_verify LOCATION) +- + ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${binDir}) + + INSTALL(TARGETS json_verify RUNTIME DESTINATION bin) diff --git a/libraries/yaml-cpp/yaml-cpp.SlackBuild b/libraries/yaml-cpp/yaml-cpp.SlackBuild index a3fbb14401..5d69f2c65f 100644 --- a/libraries/yaml-cpp/yaml-cpp.SlackBuild +++ b/libraries/yaml-cpp/yaml-cpp.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=yaml-cpp -VERSION=${VERSION:-0.7.0} +VERSION=${VERSION:-0.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -69,9 +66,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$PRGNAM-$VERSION +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 \ @@ -79,12 +76,16 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# For gcc >= 15.x +sed -i '/ostream_wrapper.h/i #include ' src/emitterutils.cpp + mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/libraries/yaml-cpp/yaml-cpp.info b/libraries/yaml-cpp/yaml-cpp.info index 8297e8e4dd..4d19facc7d 100644 --- a/libraries/yaml-cpp/yaml-cpp.info +++ b/libraries/yaml-cpp/yaml-cpp.info @@ -1,8 +1,8 @@ PRGNAM="yaml-cpp" -VERSION="0.7.0" +VERSION="0.8.0" HOMEPAGE="https://github.com/jbeder/yaml-cpp" -DOWNLOAD="https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.7.0/yaml-cpp-yaml-cpp-0.7.0.tar.gz" -MD5SUM="74d646a3cc1b5d519829441db96744f0" +DOWNLOAD="https://github.com/jbeder/yaml-cpp/archive/0.8.0/yaml-cpp-0.8.0.tar.gz" +MD5SUM="1d2c7975edba60e995abe3c4af6480e5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/zstd-cmake/README b/libraries/zstd-cmake/README deleted file mode 100644 index 3ddefa5f00..0000000000 --- a/libraries/zstd-cmake/README +++ /dev/null @@ -1,2 +0,0 @@ -This is only the cmake files meant to compliment the zstd package -already in Slackware. diff --git a/libraries/zstd-cmake/slack-desc b/libraries/zstd-cmake/slack-desc deleted file mode 100644 index 9adf2daff3..0000000000 --- a/libraries/zstd-cmake/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -zstd-cmake: zstd-cmake (cmake files for zstd) -zstd-cmake: -zstd-cmake: Provide the cmake files necessary for cmake to find zstd. -zstd-cmake: -zstd-cmake: Homepage: http://www.zstd.net -zstd-cmake: -zstd-cmake: -zstd-cmake: -zstd-cmake: -zstd-cmake: -zstd-cmake: diff --git a/libraries/zstd-cmake/zstd-cmake.SlackBuild b/libraries/zstd-cmake/zstd-cmake.SlackBuild deleted file mode 100644 index 81098203a3..0000000000 --- a/libraries/zstd-cmake/zstd-cmake.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -# Slackware build script for zstd-cmake - -# Copyright 2022-2023 Steven Voges -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=zstd-cmake -SRCNAM=zstd -VERSION=${VERSION:-1.5.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 {} \; - -mkdir -p build/cmake/build -cd build/cmake/build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DZSTD_BUILD_PROGRAMS=OFF \ - -DZSTD_BUILD_STATIC=OFF \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd ../../.. - -rm -r $PKG/usr/include -rm -r $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig -rm $PKG/usr/lib$LIBDIRSUFFIX/libzstd.* -sed -i 's/${_IMPORT_PREFIX}\//\//g' \ - $PKG/usr/lib${LIBDIRSUFFIX}/cmake/$SRCNAM/${SRCNAM}Targets-release.cmake - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.md CHANGELOG COPYING LICENSE \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/zstd-cmake/zstd-cmake.info b/libraries/zstd-cmake/zstd-cmake.info deleted file mode 100644 index 51061140f6..0000000000 --- a/libraries/zstd-cmake/zstd-cmake.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="zstd-cmake" -VERSION="1.5.5" -HOMEPAGE="http://www.zstd.net" -DOWNLOAD="https://github.com/facebook/zstd/archive/v1.5.5/zstd-1.5.5.tar.gz" -MD5SUM="4ff0ee1965ab161bc55be7c9dcd1f7f9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/zxing-cpp/README b/libraries/zxing-cpp/README deleted file mode 100644 index 7e7c2ad1d0..0000000000 --- a/libraries/zxing-cpp/README +++ /dev/null @@ -1,20 +0,0 @@ -ZXing-C++ ("zebra crossing") is an open-source, multi-format -linear/matrix barcode image processing library implemented in C++. - -It was originally ported from the Java ZXing Library but has been -developed further and now includes many improvements in terms of -runtime and detection performance. It can both read and write -barcodes in a number of formats. - -Features: - * Written in pure C++17 (/C++20), no third-party dependencies - (for the library itself) - * Thread safe - * Wrappers/Bindings for: - - Android - - C - - iOS - - Python - - WebAssembly - - WinRT - - Flutter (external project) diff --git a/libraries/zxing-cpp/slack-desc b/libraries/zxing-cpp/slack-desc deleted file mode 100644 index 2211be0a13..0000000000 --- a/libraries/zxing-cpp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -zxing-cpp: zxing-cpp (barcode image processing library) -zxing-cpp: -zxing-cpp: ZXing-C++ ("zebra crossing") is an open-source, multi-format -zxing-cpp: linear/matrix barcode image processing library implemented in C++. -zxing-cpp: It can both read and write barcodes in a number of formats. -zxing-cpp: -zxing-cpp: Homepage: https://github.com/zxing-cpp/zxing-cpp -zxing-cpp: -zxing-cpp: -zxing-cpp: -zxing-cpp: diff --git a/libraries/zxing-cpp/zxing-cpp.SlackBuild b/libraries/zxing-cpp/zxing-cpp.SlackBuild deleted file mode 100644 index d5acf0cfcd..0000000000 --- a/libraries/zxing-cpp/zxing-cpp.SlackBuild +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash - -# Slackware build script for zxing-cpp - -# Copyright 2023 Bloyburt -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=zxing-cpp -VERSION=${VERSION:-2.2.1} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} -STBVER=${STBVER:-03f50e343d796e492e6579a11143a085429d7f5d} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - 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 - -# Use a local version of the stb image library -patch zxing.cmake $CWD/zxing.cmake.patch -cp -a $CWD/stb-$STBVER.tar.gz . -tar xvf stb-$STBVER.tar.gz -mv stb-$STBVER stb-src - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - -DMAN_INSTALL_DIR=/usr/man \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/zxing-cpp/zxing-cpp.info b/libraries/zxing-cpp/zxing-cpp.info deleted file mode 100644 index 17e51a38e2..0000000000 --- a/libraries/zxing-cpp/zxing-cpp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="zxing-cpp" -VERSION="2.2.1" -HOMEPAGE="https://github.com/zxing-cpp/zxing-cpp" -DOWNLOAD="https://github.com/zxing-cpp/zxing-cpp/archive/v2.2.1/zxing-cpp-2.2.1.tar.gz https://github.com/nothings/stb/archive/03f50e3/stb-03f50e343d796e492e6579a11143a085429d7f5d.tar.gz" -MD5SUM="8d2b1592668c57f77c6351c8bb5fe739 6c2059b2728abb6da1d93ec52eaddd9c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Bloyburt" -EMAIL="alexpen@startmail.com" diff --git a/libraries/zxing-cpp/zxing.cmake.patch b/libraries/zxing-cpp/zxing.cmake.patch deleted file mode 100644 index c7fc316223..0000000000 --- a/libraries/zxing-cpp/zxing.cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- zxing.cmake.orig 2023-11-10 19:38:55.601450169 +0000 -+++ zxing.cmake 2023-11-10 19:39:15.889449494 +0000 -@@ -12,11 +12,8 @@ - - if (NOT STB_FOUND) - include(FetchContent) -- FetchContent_Declare (stb -- GIT_REPOSITORY https://github.com/nothings/stb.git) -- FetchContent_MakeAvailable (stb) - add_library(stb::stb INTERFACE IMPORTED) -- target_include_directories(stb::stb INTERFACE ${stb_SOURCE_DIR}) -+ target_include_directories(stb::stb INTERFACE ../stb-src) - else() - add_library(stb::stb ALIAS PkgConfig::STB) - endif() diff --git a/misc/cwiid/cwiid.SlackBuild b/misc/cwiid/cwiid.SlackBuild index d8ddb2befe..c6746f496d 100644 --- a/misc/cwiid/cwiid.SlackBuild +++ b/misc/cwiid/cwiid.SlackBuild @@ -29,14 +29,14 @@ # - Fixed permissions of config files and header # - Added ir_fps and nunchuk_kb plugins -# https://deb.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.91-2.debian.tar.xz +# https://deb.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.91-11.debian.tar.xz # https://deb.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.91.orig.tar.xz cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cwiid -VERSION=${VERSION:-0.6.91_2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.6.91_11} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -90,16 +90,13 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -# this patch is debian-specific (calls dpkg): -rm -f debian/patches/python-setup.py.patch +# this is for a python version we still don't have +rm -f debian/patches/py3.13-buffers.patch for i in $( cat debian/patches/series ); do - [ -e $i ] && patch -p1 < debian/patches/$i + [ -e debian/patches/$i ] && patch -p1 < debian/patches/$i || true done -# re-enable this when needed -#patch -p1 < $CWD/python310.patch - autoreconf -if ./configure \ @@ -135,12 +132,12 @@ gzip -9 $PKG/usr/man/man1/* gzip -9c debian/lswm.1 > $PKG/usr/man/man1/lswm.1.gz mkdir -p $PKG/usr/share/pixmaps -cp -a debian/icons/*.xpm $PKG/usr/share/pixmaps +cp -a $CWD/wmgui.xpm $PKG/usr/share/pixmaps mkdir -p $PKG/usr/share/applications sed -e '/^Icon/s,=.*,=/usr/share/pixmaps/wmgui.xpm,' \ -e '/^Categories/s,$,;Settings;,' \ - debian/menus/wmgui.desktop > $PKG/usr/share/applications/wmgui.desktop + $CWD/wmgui.desktop > $PKG/usr/share/applications/wmgui.desktop # init script written for this build mkdir -p $PKG/etc/rc.d/ diff --git a/misc/cwiid/cwiid.info b/misc/cwiid/cwiid.info index 21b287e8ec..da42ff26a6 100644 --- a/misc/cwiid/cwiid.info +++ b/misc/cwiid/cwiid.info @@ -1,10 +1,10 @@ PRGNAM="cwiid" -VERSION="0.6.91_2" +VERSION="0.6.91_11" HOMEPAGE="https://packages.debian.org/sid/libcwiid1" DOWNLOAD="https://deb.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.91.orig.tar.xz \ - https://deb.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.91-2.debian.tar.xz" + https://deb.debian.org/debian/pool/main/c/cwiid/cwiid_0.6.91-11.debian.tar.xz" MD5SUM="3af0651c9d81693d39bb69675885c3d7 \ - 0a3361ed2a29e4b68d6798e2347725de" + 699345b20d04c940bf06938956695864" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/misc/cwiid/python310.patch b/misc/cwiid/python310.patch deleted file mode 100644 index 5a835aef7e..0000000000 --- a/misc/cwiid/python310.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cwiid/configure.ac.orig 2021-10-25 12:06:48.965614546 +0700 -+++ cwiid/configure.ac 2021-10-25 12:07:01.190613822 +0700 -@@ -67,7 +67,7 @@ - fi - AC_SUBST(PYTHON) - if test $PYTHON; then -- PYTHON_VERSION=[`$PYTHON -c 'import sys; print (sys.version[:3])'`] -+ PYTHON_VERSION=[`$PYTHON -c 'import sys; print (sys.version[:4])'`] - AC_SUBST(PYTHON_VERSION) - AC_DEFINE([HAVE_PYTHON],1,[Define to 1 if python support is enabled]) - fi diff --git a/misc/cwiid/wmgui.desktop b/misc/cwiid/wmgui.desktop new file mode 100644 index 0000000000..364d055a46 --- /dev/null +++ b/misc/cwiid/wmgui.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Wmgui +GenericName=Graphical user interface to the wiimote +GenericName[fr]=Interface graphique pour la wiimote +Comment=Simple GTK gui to the wiimote to test and display the wiimote data. +Comment[fr]=Simple interface graphique pour la wiimote pour tester et afficher les informations de la wiimote. +Exec=wmgui +Icon=wmgui.xpm +Terminal=false +Type=Application +Categories=Utility;HardwareSettings diff --git a/misc/cwiid/wmgui.xpm b/misc/cwiid/wmgui.xpm new file mode 100644 index 0000000000..6f66669f67 --- /dev/null +++ b/misc/cwiid/wmgui.xpm @@ -0,0 +1,552 @@ +/* XPM */ +static char * wmgui_xpm[] = { +"39 45 504 2", +" c None", +". c #010C2D", +"+ c #000B2B", +"@ c #000C2B", +"# c #000B2A", +"$ c #000C2A", +"% c #000B29", +"& c #000A29", +"* c #000C30", +"= c #000B2E", +"- c #000A2D", +"; c #000A2B", +"> c #000A2A", +", c #000B2D", +"' c #000D2F", +") c #000F35", +"! c #000D33", +"~ c #000C31", +"{ c #000B30", +"] c #000C2E", +"^ c #000C2D", +"/ c #000B2C", +"( c #000D32", +"_ c #010F35", +": c #00153C", +"< c #001139", +"[ c #001037", +"} c #000E35", +"| c #000E34", +"1 c #000D31", +"2 c #000C2C", +"3 c #000C2F", +"4 c #000D34", +"5 c #001138", +"6 c #001840", +"7 c #00153E", +"8 c #00133C", +"9 c #00123A", +"0 c #001038", +"a c #000F37", +"b c #030F31", +"c c #71737A", +"d c #B0B0B1", +"e c #B8B8B8", +"f c #BCBCBC", +"g c #BDBDBD", +"h c #BEBEBE", +"i c #BFBFBF", +"j c #A4A5A7", +"k c #2A3145", +"l c #000F36", +"m c #00143C", +"n c #001C45", +"o c #001943", +"p c #001741", +"q c #00163F", +"r c #00143D", +"s c #00123C", +"t c #646872", +"u c #E5E5E6", +"v c #E5DDDF", +"w c #DBD8D9", +"x c #F5F5F5", +"y c #F6F6F6", +"z c #F8F8F8", +"A c #F9F9F9", +"B c #FAFAFA", +"C c #DCDCDC", +"D c #081432", +"E c #00123B", +"F c #001841", +"G c #01214B", +"H c #001D48", +"I c #001B46", +"J c #001A44", +"K c #001842", +"L c #001742", +"M c #001640", +"N c #A1A1A1", +"O c #E8E8E8", +"P c #DBD4D5", +"Q c #DCD7D8", +"R c #F7F7F7", +"S c #F4F4F4", +"T c #293449", +"U c #001C46", +"V c #00214C", +"W c #00204B", +"X c #001F49", +"Y c #001E48", +"Z c #001D47", +"` c #001C47", +" . c #9D9D9D", +".. c #EFEFEF", +"+. c #EBEBEB", +"@. c #EDEDED", +"#. c #D7D7D7", +"$. c #D1D1D1", +"%. c #2A374D", +"&. c #001A46", +"*. c #001B45", +"=. c #001E49", +"-. c #00244E", +";. c #00234E", +">. c #00224D", +",. c #00214D", +"'. c #00214E", +"). c #00204D", +"!. c #F2F2F2", +"~. c #F1F1F1", +"{. c #B9B9B9", +"]. c #2A3A50", +"^. c #00204C", +"/. c #01254F", +"(. c #00244F", +"_. c #002550", +":. c #002551", +"<. c #002652", +"[. c #002653", +"}. c #002753", +"|. c #002754", +"1. c #002755", +"2. c #002654", +"3. c #D6D6D6", +"4. c #C1C1C1", +"5. c #E2E2E2", +"6. c #D0D0D0", +"7. c #2A3D54", +"8. c #002552", +"9. c #002450", +"0. c #00224C", +"a. c #002956", +"b. c #002B58", +"c. c #002C5A", +"d. c #002D5B", +"e. c #002D5C", +"f. c #002D5E", +"g. c #002C5C", +"h. c #D9D9D9", +"i. c #CBCBCB", +"j. c #E1E1E1", +"k. c #E4E4E4", +"l. c #D4D4D4", +"m. c #2A4058", +"n. c #002C5B", +"o. c #002B59", +"p. c #002A58", +"q. c #002854", +"r. c #00204A", +"s. c #002F5E", +"t. c #003261", +"u. c #003363", +"v. c #003465", +"w. c #003466", +"x. c #003364", +"y. c #F3F3F3", +"z. c #CACACA", +"A. c #2A435C", +"B. c #003365", +"C. c #003263", +"D. c #003262", +"E. c #00305F", +"F. c #002E5C", +"G. c #002855", +"H. c #003463", +"I. c #003868", +"J. c #003A6C", +"K. c #003C6E", +"L. c #003C6F", +"M. c #003B6D", +"N. c #DFDFDF", +"O. c #2A4760", +"P. c #003A6D", +"Q. c #00396A", +"R. c #003666", +"S. c #003362", +"T. c #002957", +"U. c #003160", +"V. c #003767", +"W. c #004173", +"X. c #004376", +"Y. c #004478", +"Z. c #CDCDCD", +"`. c #D3D3D3", +" + c #2A4B65", +".+ c #004174", +"++ c #003F71", +"@+ c #003B6C", +"#+ c #004578", +"$+ c #004A7D", +"%+ c #004D81", +"&+ c #004D7F", +"*+ c #C9C9C9", +"=+ c #D2D2D2", +"-+ c #2A506A", +";+ c #004B7F", +">+ c #00487C", +",+ c #003E70", +"'+ c #003769", +")+ c #003161", +"!+ c #001944", +"~+ c #001C48", +"{+ c #00214F", +"]+ c #002D5D", +"^+ c #00396C", +"/+ c #004F82", +"(+ c #005588", +"_+ c #005888", +":+ c #2A556E", +"<+ c #005386", +"[+ c #00467A", +"}+ c #003F72", +"|+ c #00386A", +"1+ c #003162", +"2+ c #002B5B", +"3+ c #002554", +"4+ c #001B47", +"5+ c #011943", +"6+ c #001641", +"7+ c #001844", +"8+ c #001C49", +"9+ c #002150", +"0+ c #002757", +"a+ c #004175", +"b+ c #004A7E", +"c+ c #005C8D", +"d+ c #006290", +"e+ c #CFCFCF", +"f+ c #F0F0F0", +"g+ c #2A5A71", +"h+ c #005A8C", +"i+ c #005184", +"j+ c #004073", +"k+ c #00386B", +"l+ c #003163", +"m+ c #002B5C", +"n+ c #002655", +"o+ c #00204E", +"p+ c #001B48", +"q+ c #001843", +"r+ c #001541", +"s+ c #001845", +"t+ c #001C4A", +"u+ c #002151", +"v+ c #002758", +"w+ c #002D5F", +"x+ c #003366", +"y+ c #003A6E", +"z+ c #004276", +"A+ c #005688", +"B+ c #006291", +"C+ c #006B95", +"D+ c #2A5E74", +"E+ c #005F8F", +"F+ c #005486", +"G+ c #00497D", +"H+ c #004074", +"I+ c #00386C", +"J+ c #003164", +"K+ c #002B5D", +"L+ c #002556", +"M+ c #00204F", +"N+ c #001B49", +"O+ c #001744", +"P+ c #011843", +"Q+ c #001642", +"R+ c #001C4B", +"S+ c #002152", +"T+ c #002659", +"U+ c #002C60", +"V+ c #003267", +"W+ c #003A6F", +"X+ c #004377", +"Y+ c #004D80", +"Z+ c #005989", +"`+ c #006693", +" @ c #007198", +".@ c #2A6075", +"+@ c #006390", +"@@ c #005687", +"#@ c #004B7E", +"$@ c #004075", +"%@ c #00386D", +"&@ c #003165", +"*@ c #002B5E", +"=@ c #002557", +"-@ c #002050", +";@ c #011B45", +">@ c #001643", +",@ c #001846", +"'@ c #001B4C", +")@ c #002053", +"!@ c #002559", +"~@ c #002B60", +"{@ c #003268", +"]@ c #003A70", +"^@ c #004F81", +"/@ c #005C8A", +"(@ c #006994", +"_@ c #007499", +":@ c #D8D8D8", +"<@ c #1D5468", +"[@ c #006691", +"}@ c #005887", +"|@ c #004C7E", +"1@ c #003065", +"2@ c #002A5E", +"3@ c #002457", +"4@ c #001F51", +"5@ c #001A4A", +"6@ c #001745", +"7@ c #001847", +"8@ c #001B4D", +"9@ c #001F53", +"0@ c #002459", +"a@ c #002B61", +"b@ c #003B70", +"c@ c #005181", +"d@ c #005D8A", +"e@ c #006B94", +"f@ c #00769A", +"g@ c #DADADA", +"h@ c #C2C2C2", +"i@ c #BBC2C7", +"j@ c #AABAC6", +"k@ c #ACACAC", +"l@ c #C5C5C5", +"m@ c #C3C3C3", +"n@ c #195164", +"o@ c #006792", +"p@ c #005A88", +"q@ c #004E7F", +"r@ c #00386E", +"s@ c #003066", +"t@ c #00295E", +"u@ c #002357", +"v@ c #001E51", +"w@ c #001A4B", +"x@ c #00245A", +"y@ c #004679", +"z@ c #005281", +"A@ c #005E8B", +"B@ c #00779A", +"C@ c #E5E5E5", +"D@ c #C7C7C7", +"E@ c #D5D5D5", +"F@ c #CBCED0", +"G@ c #B4BDC4", +"H@ c #DDDDDD", +"I@ c #00396E", +"J@ c #00285F", +"K@ c #002258", +"L@ c #001D51", +"M@ c #001743", +"N@ c #001945", +"O@ c #003269", +"P@ c #005282", +"Q@ c #00779B", +"R@ c #ECECEC", +"S@ c #011B46", +"T@ c #00255A", +"U@ c #003368", +"V@ c #005D8B", +"W@ c #006A94", +"X@ c #EEEEEE", +"Y@ c #E4E5E8", +"Z@ c #E1E3E6", +"`@ c #EAEBEC", +" # c #195064", +".# c #005988", +"+# c #004D7E", +"@# c #001C4C", +"## c #002153", +"$# c #005B8A", +"%# c #006894", +"&# c #007399", +"*# c #E9E9EB", +"=# c #D6D7DB", +"-# c #C9CACE", +";# c #E6E7EA", +"># c #194F64", +",# c #006591", +"'# c #001F50", +")# c #002759", +"!# c #002D60", +"~# c #003367", +"{# c #003B6F", +"]# c #005889", +"^# c #006592", +"/# c #006D96", +"(# c #E9E9EA", +"_# c #DBDCDF", +":# c #D0D1D4", +"<# c #E5E6E9", +"[# c #194D63", +"}# c #00618F", +"|# c #005586", +"1# c #001A49", +"2# c #001D4B", +"3# c #002251", +"4# c #002858", +"5# c #002E5F", +"6# c #003467", +"7# c #004277", +"8# c #005587", +"9# c #9B9B9B", +"0# c #DBDCE0", +"a# c #D1D2D6", +"b# c #194A61", +"c# c #005D8D", +"d# c #005285", +"e# c #001D4A", +"f# c #002250", +"g# c #002857", +"h# c #002E5E", +"i# c #004275", +"j# c #005084", +"k# c #005789", +"l# c #005A89", +"m# c #999999", +"n# c #E8E9EB", +"o# c #19455E", +"p# c #004E82", +"q# c #00477B", +"r# c #003F73", +"s# c #002555", +"t# c #001A45", +"u# c #001D49", +"v# c #00224F", +"w# c #002856", +"x# c #002E5D", +"y# c #003464", +"z# c #004E80", +"A# c #19405A", +"B# c #003E71", +"C# c #00376A", +"D# c #00224E", +"E# c #003869", +"F# c #003E6F", +"G# c #004579", +"H# c #004477", +"I# c #193B55", +"J# c #003768", +"K# c #003565", +"L# c #003969", +"M# c #003C70", +"N# c #003B6E", +"O# c #E9E9E9", +"P# c #193751", +"Q# c #003D71", +"R# c #003D70", +"S# c #002A57", +"T# c #003567", +"U# c #EAEAEA", +"V# c #19334C", +"W# c #003668", +"X# c #003566", +"Y# c #00234F", +"Z# c #002C5D", +"`# c #E3E3E3", +" $ c #192F48", +".$ c #002F60", +"+$ c #00214B", +"@$ c #002756", +"#$ c #E7E7E7", +"$$ c #B7B7B7", +"%$ c #192C44", +"&$ c #002451", +"*$ c #192940", +"=$ c #01244F", +"-$ c #989898", +";$ c #E4EAED", +">$ c #EAECEC", +",$ c #19263D", +"'$ c #001F4A", +")$ c #011F49", +"!$ c #898989", +"~$ c #E6E6E6", +"{$ c #B6B6B6", +"]$ c #131F36", +"^$ c #001B44", +"/$ c #353A45", +"($ c #E0E0E0", +"_$ c #717171", +":$ c #011032", +"<$ c #001740", +"[$ c #00173F", +"}$ c #00133B", +"|$ c #000F33", +"1$ c #242A38", +"2$ c #56575B", +"3$ c #5E6062", +"4$ c #5F6063", +"5$ c #5D5E61", +"6$ c #43454C", +"7$ c #09132D", +"8$ c #00143B", +"9$ c #000E33", +"0$ c #000E36", +"a$ c #000B2F", +"b$ c #000C32", +"c$ c #011137", +"d$ c #000A2C", +"e$ c #010B2D", +" ", +" . + @ @ # $ $ % & ", +" * = - ; > > & & & & > ; , ' ", +" ) ! ~ { ] ^ ^ , , / / , , , = * ( _ ", +" : < [ } | ! ( 1 ^ ^ ^ ^ 2 2 3 1 1 ( 4 ) 5 ", +" 6 7 8 9 < 0 a b c d e f g h i j k ) l a 0 9 m ", +" n o p q 7 r 8 s t u v w x y z A B C D E E 8 r q F ", +" G H I J o K L p M N O P Q x y R A B S T M M p p K J U ", +" V W X Y Z ` ` ` I ...+.@.#.$.R A B S %.&.*.*.I U Z =.W ", +" -.;.;.>.>.,.,.,.'.). ...!.~.$.{.S z B S ].).^.W W W W V >./. ", +" -.(._.:.<.<.[.}.|.1.2. ...3.4.5.@.i 6.B S 7.2.[.8.:._.9.(.(.-. ", +" 0.;.:.|.a.b.c.d.e.f.g. ...h.i.j.k.l.l.B S m.g.n.o.p.a.q.<.9.;.>. ", +" X r.>.:.a.c.s.t.u.v.w.x. ...!.y.z.g !.A B S A.B.C.D.E.F.o.G.9.>.W ", +" Z =.,.8.p.s.H.I.J.K.L.M. ...!.y.5.N.R A B S O.P.J.Q.R.S.F.T.:.V =.Y ", +" *.H ,.[.o.U.V.K.W.X.Y.X. ...!.!.Z.`.y A B S +X..+++@+R.E.p.8.^.H I ", +" K J H '.2.n.S.Q.++#+$+%+&+ ...!.z.*+`.=+A B S -+;+>+X.,+'+)+o.8.^.` J ", +" p !+~+{+1.]+x.^+.+>+/+(+_+ ...!.i.6.6.6.A B S :+<+%+[+}+|+1+2+3+).4+o 5+ ", +" 6+7+8+9+0+f.B.P.a+b+<+c+d+ ...!.+.$.e+f+A B S g+h+i+>+j+k+l+m+n+o+p+q+6+ ", +" r+s+t+u+v+w+x+y+z+;+A+B+C+ ...!.y.x y R A B S D+E+F+G+H+I+J+K+L+M+N+O+6+ ", +" P+Q+s+R+S+T+U+V+W+X+Y+Z+`+ @ ...!.y.x y R A B S .@+@@@#@$@%@&@*@=@-@N+O+Q+ ", +" ;@>@,@'@)@!@~@{@]@Y.^@/@(@_@ ...+.!.!.f+R ~.z :@<@[@}@|@a+%@1@2@3@4@5@6@7+ ", +" !+>@7@8@9@0@a@{@b@#+c@d@e@f@ .g@h@z.i@j@3.k@l@m@n@o@p@q@z+r@s@t@u@v@w@6@O+` ", +" q+>@7@8@9@x@a@{@b@y@z@A@e@B@ .C@D@E@F@G@H@{.=+m@n@o@p@q@X.I@s@J@K@L@w@6@M@N@", +" J >@7@8@9@x@a@O@b@y@P@A@C+Q@ ...!.y.f+R@R@R@R@m@n@o@p@q@X.I@s@J@K@L@w@6@O+` ", +" S@>@,@8@)@T@a@U@b@#+c@V@W@f@ ...!.X@Y@Z@`@R@R@m@ #[@.#+#z+%@s@t@u@v@5@6@7+ ", +" o >@,@@###T+U+U@b@Y.^@$#%#&# ...X@*#=#-#;#R@R@m@>#,#}@|@a+%@1@2@3@'#5@6@M@ ", +" Q+,@@#S+)#!#~#{#X+Y+]#^#/# .@.R@(#_#:#<#R@R@m@[#}#|#$+$@%@&@*@=@'#1#6@Q+ ", +" 6+s+2#3#4#5#6#{#7#;+8#E+,#9#+.R@*#0#a#;#R@R@m@b#c#d#>+H+I+J+K+L+M+N+O+Q+ ", +" L N@e#f#g#h#w.y+i#G+j#k#l#m#+.R@R@*#n#+.R@R@m@o#A+p#q#r#k+l+m+s#o+p+7+P+ ", +" K t#u#v#w#x#y#J.j+[+b+p#z#m#+.R@R@e+*+O R@R@m@A#p#b+#+B#C#1+2+3+).~+!+ ", +" I =.D#1.d.u.E#F#.+X+G#H#m#+.R@j.6.C@*+R@R@m@I#[+H#.+K.J#)+o.8.^.` t# ", +" Z =.D#|.c.U.K#L#@+K.M#N#m#+.R@O#h l@E@R@R@m@P#Q#R#M.Q.y#s.p.:.^.H Z ", +" X W D#<.S#e.E.S.y#w.T#B.m#+.R@R@e+h@U#R@R@m@V#W#T#X#u.U.d.a.9.V =. ", +" V Y#:.|.a.b.c.e.]+h#Z#m#+.R@`#$.3.i.R@R@m@ $.$5#x#e.c.S#}.9.>.+$ ", +" -.Y#9.9.:.<.[.|.1.@$n+m#+.R@#$$$=+=+R@R@m@%$4#g#G.|.}.<.&$Y#;. ", +" ;.>.,.V V V ,.'.{+o+m#+.R@R@5.#.R@R@R@m@*$f#v#D#D#>.>.D#;.=$ ", +" W =.H Z ` ` ` ~+4+-$+.;$>$#$U#+.O R@m@,$8+H H H H =.'$V ", +" )$U J o K F p p 6+!$~$R@R@R@R@R@R@+.{$]$K K K o J *.H ", +" ^$F q 7 r m 8 8 /${$C j.j.j.j.($Z._$:$r r 7 q <$o ", +" [$m }$< 5 [ [ |$1$2$3$4$4$4$5$6$7$0 0 < 9 m 7 ", +" 8$5 l } | ! ! ! ! 9$9$9$9$9$9$9$9$| 0$[ 9 ", +" ) ! ~ { a$] ] ] ] ] ] ] ] a$* b$4 c$ ", +" * = d$; ; > > > > ; ; - = 1 ", +" e$; @ @ # $ @ # ; ", +" "}; diff --git a/misc/fcitx5-chinese-addons/README b/misc/fcitx5-chinese-addons/README deleted file mode 100644 index 2cb365fe59..0000000000 --- a/misc/fcitx5-chinese-addons/README +++ /dev/null @@ -1,7 +0,0 @@ -fcitx5-chinese-addons provides pinyin and table input method support -for fcitx5. Released under LGPL-2.1+. - -im/pinyin/emoji.txt is derived from Unicode CLDR with modification. - -If you want to build this package with Qt6, please set -DUSE_QT6 to -On instead of Off in the SlackBuild. diff --git a/misc/fcitx5-chinese-addons/doinst.sh b/misc/fcitx5-chinese-addons/doinst.sh deleted file mode 100644 index ca71fd3c40..0000000000 --- a/misc/fcitx5-chinese-addons/doinst.sh +++ /dev/null @@ -1,12 +0,0 @@ -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi - diff --git a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild b/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild deleted file mode 100644 index 62fefb5cc4..0000000000 --- a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash - -# Copyright 2022-2023 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-chinese-addons -VERSION=${VERSION:-5.1.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-${VERSION}_dict.tar.* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DUSE_QT6=Off \ - -DENABLE_TEST=Off .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.info b/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.info deleted file mode 100644 index 071e9693a5..0000000000 --- a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-chinese-addons" -VERSION="5.1.8" -HOMEPAGE="https://github.com/fcitx/fcitx5-chinese-addons" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.8_dict.tar.zst" -MD5SUM="5046d9a50ba02871808a18829944050d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx5-qt libime" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-chinese-addons/slack-desc b/misc/fcitx5-chinese-addons/slack-desc deleted file mode 100644 index 01fc72e5f1..0000000000 --- a/misc/fcitx5-chinese-addons/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-chinese-addons: fcitx5-chinese-addons (Chinese related addon for fcitx5) -fcitx5-chinese-addons: -fcitx5-chinese-addons: This provides pinyin and table input method support for fcitx5. -fcitx5-chinese-addons: Released under LGPL-2.1+. -fcitx5-chinese-addons: -fcitx5-chinese-addons: -fcitx5-chinese-addons: -fcitx5-chinese-addons: -fcitx5-chinese-addons: -fcitx5-chinese-addons: Homepage: https://github.com/fcitx/fcitx5-chinese-addons -fcitx5-chinese-addons: diff --git a/misc/fcitx5-configtool/README b/misc/fcitx5-configtool/README deleted file mode 100644 index 7d1edfbab7..0000000000 --- a/misc/fcitx5-configtool/README +++ /dev/null @@ -1,10 +0,0 @@ -Fcitx5-configtool provides the configuration GUI for Fcitx5. - -Do note that although this package could be installed along with the -bundled kcm-fcitx, they are considered conflicting packages in some -other distros (like Arch), so depending on your situation, you may -uninstall and blacklist kcm-fcitx before installing this package. - -Building with Qt6 is turned off by default. If you want to use the -Qt6 version, simply change -DUSE_QT6=Off into -DUSE_QT6=On in the -SlackBuild. diff --git a/misc/fcitx5-configtool/doinst.sh b/misc/fcitx5-configtool/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/misc/fcitx5-configtool/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/misc/fcitx5-configtool/fcitx5-configtool.SlackBuild b/misc/fcitx5-configtool/fcitx5-configtool.SlackBuild deleted file mode 100644 index 0f5530da85..0000000000 --- a/misc/fcitx5-configtool/fcitx5-configtool.SlackBuild +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -# Copyright 2022-2023 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-configtool -VERSION=${VERSION:-5.1.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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.* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DUSE_QT6=Off .. - make - make install/strip DESTDIR=$PKG -cd .. - -# patch desktop file to conform with standards -if [ -f $PKG/usr/share/applications/kcm_fcitx5.desktop ]; then - sed -i 's/True/true/g' $PKG/usr/share/applications/kcm_fcitx5.desktop -fi - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5-configtool/fcitx5-configtool.info b/misc/fcitx5-configtool/fcitx5-configtool.info deleted file mode 100644 index efe3547294..0000000000 --- a/misc/fcitx5-configtool/fcitx5-configtool.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-configtool" -VERSION="5.1.8" -HOMEPAGE="https://github.com/fcitx/fcitx5-configtool" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-5.1.8.tar.zst" -MD5SUM="eaf80a7697063d406a420a8108e4b7e9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx5-qt" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-configtool/slack-desc b/misc/fcitx5-configtool/slack-desc deleted file mode 100644 index 663a547c50..0000000000 --- a/misc/fcitx5-configtool/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-configtool: fcitx5-configtool (Configuration Tool for Fcitx5) -fcitx5-configtool: -fcitx5-configtool: Configuration Tool for Fcitx5. -fcitx5-configtool: -fcitx5-configtool: Homepage: https://fcitx-im.org/wiki/Fcitx_5 -fcitx5-configtool: -fcitx5-configtool: -fcitx5-configtool: -fcitx5-configtool: -fcitx5-configtool: -fcitx5-configtool: diff --git a/misc/fcitx5-gtk/README b/misc/fcitx5-gtk/README deleted file mode 100644 index aa8eaf0727..0000000000 --- a/misc/fcitx5-gtk/README +++ /dev/null @@ -1,15 +0,0 @@ -fcitx5-gtk provides the GTK IM modules and libraries for fcitx5. - -If you enable GObject Introspection (via the ENABLE_GIR CMake -variable), make install will install some files to the system's GIR -directories regardless of what CMAKE_INSTALL_PREFIX is set to. - -If you have installed it to a custom prefix, you'll need to update the -GTK input method module cache. This is done by invoking -gtk-query-immodules-3.0 (or gtk-query-immodules-3.0 for GTK 2) and -setting GTK_PATH to point at fcitx5-gtk's GTK library install path -beforehand. For example: - - GTK_PATH=/your/install/path/lib/gtk-3.0 gtk-query-immodules-3.0 \ - --update-cache - diff --git a/misc/fcitx5-gtk/fcitx5-gtk.SlackBuild b/misc/fcitx5-gtk/fcitx5-gtk.SlackBuild deleted file mode 100644 index a9dae0160b..0000000000 --- a/misc/fcitx5-gtk/fcitx5-gtk.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -# Copyright 2022 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-gtk -VERSION=${VERSION:-5.1.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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.* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* 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 diff --git a/misc/fcitx5-gtk/fcitx5-gtk.info b/misc/fcitx5-gtk/fcitx5-gtk.info deleted file mode 100644 index 8bef5ab0ea..0000000000 --- a/misc/fcitx5-gtk/fcitx5-gtk.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-gtk" -VERSION="5.1.4" -HOMEPAGE="https://github.com/fcitx/fcitx5-gtk" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-5.1.4.tar.zst" -MD5SUM="ca4fb16f683b4cb432baa8119911aee2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx5" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-gtk/slack-desc b/misc/fcitx5-gtk/slack-desc deleted file mode 100644 index 5cd05489ea..0000000000 --- a/misc/fcitx5-gtk/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-gtk: fcitx5-gtk (Gtk IM modules and DBus client library for fcitx5) -fcitx5-gtk: -fcitx5-gtk: Gtk IM module for fcitx5 and glib based dbus client library. -fcitx5-gtk: -fcitx5-gtk: Homepage: https://fcitx-im.org/wiki/Fcitx_5 -fcitx5-gtk: -fcitx5-gtk: -fcitx5-gtk: -fcitx5-gtk: -fcitx5-gtk: -fcitx5-gtk: diff --git a/misc/fcitx5-mozc/0013-mozc-includes.patch b/misc/fcitx5-mozc/0013-mozc-includes.patch new file mode 100644 index 0000000000..b437f24e8b --- /dev/null +++ b/misc/fcitx5-mozc/0013-mozc-includes.patch @@ -0,0 +1,20 @@ +--- third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc 2023-09-05 17:36:23.973250174 +0900 ++++ third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc 2023-09-05 17:37:06.585477262 +0900 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + +--- third_party/abseil-cpp/absl/strings/internal/str_format/extension.h 2023-09-05 17:45:04.104106229 +0900 ++++ third_party/abseil-cpp/absl/strings/internal/str_format/extension.h 2023-09-05 17:45:24.484098612 +0900 +@@ -20,6 +20,7 @@ + + #include + #include ++#include + #include + + #include "absl/base/config.h" diff --git a/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild b/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild index 2d679c9fce..3ca873d78e 100644 --- a/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild +++ b/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild @@ -68,7 +68,7 @@ _bldtype=Release # source rev. and version. MOZC_REV=ca82d39d08df3359fdf5c653a1f56b3e95cbe2ce -GYP_REV=caa60026e223fc501e8b337fd5086ece4028b1c6 +GYP_REV=bc83cdacf5428ab6ddcc92fd0b0fc494cc9a4d4f PROTOBUF_REV=fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a ABSEIL_CPP_REV=0f3bb466b868b523cf1dc9b2aaaed65c77b28862 BREAKPAD_REV=2022.07.12 @@ -165,6 +165,9 @@ cd src/ # Build with gcc instead of clang echo "... Apply 0012-mozc-build-gcc.patch" patch -p1 < $CWD/0012-mozc-build-gcc.patch +# gcc-13 compatibility +echo "... Apply 0013-mozc-includes.patch" +patch -p0 < $CWD/0013-mozc-includes.patch # Fix compatibility with google-glog 0.3.3 (symbol conflict) CFLAGS="${CFLAGS} -fvisibility=hidden" diff --git a/misc/fcitx5-mozc/fcitx5-mozc.info b/misc/fcitx5-mozc/fcitx5-mozc.info index 03adb5de53..26af8047fe 100644 --- a/misc/fcitx5-mozc/fcitx5-mozc.info +++ b/misc/fcitx5-mozc/fcitx5-mozc.info @@ -2,7 +2,7 @@ PRGNAM="fcitx5-mozc" VERSION="2.26.4360.102.1" HOMEPAGE="https://github.com/fcitx/mozc/" DOWNLOAD="https://github.com/fcitx/mozc/archive/ca82d39d08df3359fdf5c653a1f56b3e95cbe2ce/mozc-ca82d39d08df3359fdf5c653a1f56b3e95cbe2ce.zip \ - https://github.com/chromium/gyp/archive/caa60026e223fc501e8b337fd5086ece4028b1c6/gyp-caa60026e223fc501e8b337fd5086ece4028b1c6.zip \ + https://github.com/chromium/gyp/archive/bc83cdacf5428ab6ddcc92fd0b0fc494cc9a4d4f/gyp-bc83cdacf5428ab6ddcc92fd0b0fc494cc9a4d4f.zip \ https://github.com/protocolbuffers/protobuf/archive/fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a/protobuf-fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a.zip \ https://github.com/abseil/abseil-cpp/archive/0f3bb466b868b523cf1dc9b2aaaed65c77b28862/abseil-cpp-0f3bb466b868b523cf1dc9b2aaaed65c77b28862.zip \ https://github.com/google/breakpad/archive/v2022.07.12/breakpad-2022.07.12.zip \ @@ -13,7 +13,7 @@ DOWNLOAD="https://github.com/fcitx/mozc/archive/ca82d39d08df3359fdf5c653a1f56b3e https://gitlab.com/BrLi/brli-aur/-/raw/fcitx5-mozc-ut/x-ken-all-202110.zip \ https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz" MD5SUM="257fcb244249a3c65c576cceb5cbb7c8 \ - 699c5af5c6d7e19835afb5292d151f91 \ + 0494c10397081191f3a4a29a75a98190 \ cb4b1baed208474284161b7abd5cc17c \ 4f23c5fcb19a7ef0fb6ce0f636d480e3 \ 981e935b3b61091ca6f968a296f44eb9 \ diff --git a/misc/fcitx5-qt/README b/misc/fcitx5-qt/README deleted file mode 100644 index f72b87998b..0000000000 --- a/misc/fcitx5-qt/README +++ /dev/null @@ -1,23 +0,0 @@ -fcitx5-qt is the Qt im-module for fcitx5 and it needs to be installed -in order to use fcitx5 with Qt-based applications. It currently -supports Qt4, Qt5 and Qt6. - -You'll need several Qt modules if you're going to enable Qt5/Qt6 -support, namely QtCore, QtDbus, QtWidgets and QtX11Extras. Qt5 is -bundled in Slackware, and if you want Qt6 support you're on your -own; but any app that requires Qt6 on SBo at this point should have -already pulled all the dependencies in. - -Relevant CMake options are ENABLE_QT4, ENABLE_QT5 and ENABLE_QT6. -Only ENABLE_QT5 is turned on by default. You might want to turn the -flags on/off depending on the Qt version you are using. To enable Qt4, -you need to modify - - -DENABLE_QT4=Off \ - -from "Off" to "On". Similarly, to turn on Qt6 support, turn - - -DENABLE_QT6=On \ - -DENABLE_QT6_WAYLAND_WORKAROUND=On .. - -from "Off" to "On". diff --git a/misc/fcitx5-qt/doinst.sh b/misc/fcitx5-qt/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/misc/fcitx5-qt/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/misc/fcitx5-qt/fcitx5-qt.SlackBuild b/misc/fcitx5-qt/fcitx5-qt.SlackBuild deleted file mode 100644 index f85ad65b64..0000000000 --- a/misc/fcitx5-qt/fcitx5-qt.SlackBuild +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -# Copyright 2022-2023 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-qt -VERSION=${VERSION:-5.1.9} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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.* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DENABLE_QT4=Off \ - -DENABLE_QT6=Off \ - -DENABLE_QT6_WAYLAND_WORKAROUND=Off .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* 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 diff --git a/misc/fcitx5-qt/fcitx5-qt.info b/misc/fcitx5-qt/fcitx5-qt.info deleted file mode 100644 index b1dda17d77..0000000000 --- a/misc/fcitx5-qt/fcitx5-qt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-qt" -VERSION="5.1.9" -HOMEPAGE="https://github.com/fcitx/fcitx5-qt" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-5.1.9.tar.zst" -MD5SUM="0f3ea250162021d84dbe21ee49aff7ab" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx5" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-qt/slack-desc b/misc/fcitx5-qt/slack-desc deleted file mode 100644 index 701a0d8e04..0000000000 --- a/misc/fcitx5-qt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-qt: fcitx5-qt (Qt libraries for Fcitx5) -fcitx5-qt: -fcitx5-qt: Qt library and IM module for fcitx5 -fcitx5-qt: -fcitx5-qt: Homepage: https://fcitx-im.org/wiki/Fcitx_5 -fcitx5-qt: -fcitx5-qt: -fcitx5-qt: -fcitx5-qt: -fcitx5-qt: -fcitx5-qt: diff --git a/misc/fcitx5-table-extra/README b/misc/fcitx5-table-extra/README deleted file mode 100644 index a65ebaddbf..0000000000 --- a/misc/fcitx5-table-extra/README +++ /dev/null @@ -1,13 +0,0 @@ -fcitx5-table-extra provides extra table for Fcitx5, including Boshiamy, -Zhengma, Cangjie, and Quick. - -Zhengma's patent is expired at 2009. -Boshiamy's patent is expired at 2003.11.11. -Cangjie's author drop Cangjie's patent in 1982. - -The code of this package are released under GPLv3 or later. - -All the data file is now in public domain. - -For expired patent references, see the original README on the website: -https://github.com/fcitx/fcitx5-table-extra diff --git a/misc/fcitx5-table-extra/doinst.sh b/misc/fcitx5-table-extra/doinst.sh deleted file mode 100644 index ca71fd3c40..0000000000 --- a/misc/fcitx5-table-extra/doinst.sh +++ /dev/null @@ -1,12 +0,0 @@ -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi - diff --git a/misc/fcitx5-table-extra/fcitx5-table-extra.SlackBuild b/misc/fcitx5-table-extra/fcitx5-table-extra.SlackBuild deleted file mode 100644 index 7c9401efd3..0000000000 --- a/misc/fcitx5-table-extra/fcitx5-table-extra.SlackBuild +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash - -# Copyright 2022 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-table-extra -VERSION=${VERSION:-5.1.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -ARCH=noarch - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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.* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5-table-extra/fcitx5-table-extra.info b/misc/fcitx5-table-extra/fcitx5-table-extra.info deleted file mode 100644 index e031ed76a2..0000000000 --- a/misc/fcitx5-table-extra/fcitx5-table-extra.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-table-extra" -VERSION="5.1.8" -HOMEPAGE="https://github.com/fcitx/fcitx5-table-extra" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-5.1.8.tar.zst" -MD5SUM="e04ec85f1db352be7412916040fddbdb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libime fcitx5" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-table-extra/slack-desc b/misc/fcitx5-table-extra/slack-desc deleted file mode 100644 index 5c5f732685..0000000000 --- a/misc/fcitx5-table-extra/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-table-extra: fcitx5-table-extra (Extra table input methods for fcitx5) -fcitx5-table-extra: -fcitx5-table-extra: fcitx5-table-extra provides extra table for Fcitx5, including -fcitx5-table-extra: Boshiamy, Zhengma, Cangjie, and Quick. -fcitx5-table-extra: -fcitx5-table-extra: -fcitx5-table-extra: -fcitx5-table-extra: -fcitx5-table-extra: -fcitx5-table-extra: Homepage: https://github.com/fcitx/fcitx5-table-extra -fcitx5-table-extra: diff --git a/misc/fcitx5-table-other/README b/misc/fcitx5-table-other/README deleted file mode 100644 index 85f68343b7..0000000000 --- a/misc/fcitx5-table-other/README +++ /dev/null @@ -1,7 +0,0 @@ -fcitx-table-other provides some other tables for Fcitx, fork from -ibus-table-others, scim-tables. - -Most of the table in this package is non-Chinese table. They are listed -under /tables by language. - -The package is released under GPLv3+. diff --git a/misc/fcitx5-table-other/doinst.sh b/misc/fcitx5-table-other/doinst.sh deleted file mode 100644 index ca71fd3c40..0000000000 --- a/misc/fcitx5-table-other/doinst.sh +++ /dev/null @@ -1,12 +0,0 @@ -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi - diff --git a/misc/fcitx5-table-other/fcitx5-table-other.SlackBuild b/misc/fcitx5-table-other/fcitx5-table-other.SlackBuild deleted file mode 100644 index 25b96cc762..0000000000 --- a/misc/fcitx5-table-other/fcitx5-table-other.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash - -# Copyright 2022 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-table-other -VERSION=${VERSION:-5.1.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -ARCH=noarch - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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.* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5-table-other/fcitx5-table-other.info b/misc/fcitx5-table-other/fcitx5-table-other.info deleted file mode 100644 index da51379680..0000000000 --- a/misc/fcitx5-table-other/fcitx5-table-other.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-table-other" -VERSION="5.1.5" -HOMEPAGE="https://github.com/fcitx/fcitx5-table-other" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-5.1.5.tar.zst" -MD5SUM="d0db84b96482329d700b6a99f736e4ea" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libime fcitx5" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-table-other/slack-desc b/misc/fcitx5-table-other/slack-desc deleted file mode 100644 index 600f1a9a4a..0000000000 --- a/misc/fcitx5-table-other/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-table-other: fcitx5-table-other (Some other tables for fcitx5) -fcitx5-table-other: -fcitx5-table-other: fcitx-table-other provides some other tables for Fcitx, fork from -fcitx5-table-other: ibus-table-others, scim-tables. -fcitx5-table-other: -fcitx5-table-other: Most of the table in this package is non-Chinese table. They are -fcitx5-table-other: listed under /tables by language. -fcitx5-table-other: -fcitx5-table-other: -fcitx5-table-other: Homepage: https://github.com/fcitx/fcitx5-table-other -fcitx5-table-other: diff --git a/misc/fcitx5/README b/misc/fcitx5/README deleted file mode 100644 index bd043ee147..0000000000 --- a/misc/fcitx5/README +++ /dev/null @@ -1,37 +0,0 @@ -Fcitx is an input method framework with extension support. Currently it -supports Linux and Unix systems like freebsd. Fcitx supports typing -with many languages all over the world with a large number of engines. - -Fcitx has a slim core while provides powerful features with addons. It -is easy to customize fcitx to satisfy your own needs. - -Fcitx5 is the next generation of fcitx. - -Some cmake options to keep in mind before building are: - -- ENABLE_WAYLAND: Wayland support. Defaults to On and should be fine - for desktop environments such as KDE and GNOME. Users running - X11-based window managers will need to turn it off. - -- ENABLE_ENCHANT: Enchant support. Defaults to On. Used for word - prediction (hinting). Depends on libenchant, which is provided by - most distributions. - -The user is encouraged to check the contents of CMakeLists.txt for an -exhaustive list of options. - -For example, an i3 user who wishes to install it to /opt would run -(likely with sudo privileges): - - cmake -DENABLE_WAYLAND=Off \ - -DCMAKE_INSTALL_PREFIX=/your/install/path . - make - sudo make install - -To make fcitx5 the default input method, please add these lines to your -/etc/environment (or .profile): - - GTK_IM_MODULE=fcitx - QT_IM_MODULE=fcitx - XMODIFIERS=@im=fcitx - diff --git a/misc/fcitx5/doinst.sh b/misc/fcitx5/doinst.sh deleted file mode 100644 index 138e27de17..0000000000 --- a/misc/fcitx5/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 [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi diff --git a/misc/fcitx5/fcitx5-autostart b/misc/fcitx5/fcitx5-autostart deleted file mode 100644 index 22d8c056d3..0000000000 --- a/misc/fcitx5/fcitx5-autostart +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -START="no" - -if [ "$XIM" = "fcitx" ]; then - START="yes" -fi - -if [ "$XIM_PROGRAM" = "fcitx" ]; then - START="yes" -fi - -if [ "$GTK_IM_MODULE" = "fcitx" ]; then - START="yes" -fi - -if [ "$QT_IM_MODULE" = "fcitx" ]; then - START="yes" -fi - -if [ "$START" = "no" ]; then - exit 0 -fi - -# sleep for a little while to avoid duplicate startup -sleep 2 - -# Test whether fcitx is running correctly with dbus... -fcitx5-remote > /dev/null 2>&1 - -if [ $? = "1" ]; then - echo "Fcitx seems is not running" - fcitx5 -else - echo "Fcitx is running correctly." -fi diff --git a/misc/fcitx5/fcitx5.SlackBuild b/misc/fcitx5/fcitx5.SlackBuild deleted file mode 100644 index 0cb30f6072..0000000000 --- a/misc/fcitx5/fcitx5.SlackBuild +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -# Copyright 2022-2023 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5 -VERSION=${VERSION:-5.1.12} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-${VERSION}_dict.tar.* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - - -# Use our own autostart script to autostart fcitx5 -install -m 755 $CWD/fcitx5-autostart $PKG/usr/bin/ -sed -i "s|Exec=/usr/bin/fcitx5|Exec=/usr/bin/fcitx5-autostart|" \ - $PKG/etc/xdg/autostart/org.fcitx.Fcitx5.desktop - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* 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 diff --git a/misc/fcitx5/fcitx5.info b/misc/fcitx5/fcitx5.info deleted file mode 100644 index 49a6e297c6..0000000000 --- a/misc/fcitx5/fcitx5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5" -VERSION="5.1.12" -HOMEPAGE="https://fcitx-im.org/wiki/Fcitx_5" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-5.1.12_dict.tar.zst" -MD5SUM="b13b857332b24bdbc709199bf3563d78" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fmt xcb-imdkit" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5/slack-desc b/misc/fcitx5/slack-desc deleted file mode 100644 index eaccae7994..0000000000 --- a/misc/fcitx5/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5: fcitx5 (Input Method Framework) -fcitx5: -fcitx5: Fcitx is an input method framework with extension support. Currently -fcitx5: it supports Linux and Unix systems like freebsd. It has three built- -fcitx5: in Input Method Engine, Pinyin, QuWei and Table-based input methods. -fcitx5: Fcitx tries to provide a native feeling under all desktop as well as -fcitx5: a light weight core. You can easily customize it to fit your -fcitx5: requirements. -fcitx5: -fcitx5: Homepage: https://fcitx-im.org/wiki/Fcitx_5 -fcitx5: diff --git a/misc/moreutils/README b/misc/moreutils/README deleted file mode 100644 index 8bfc060a49..0000000000 --- a/misc/moreutils/README +++ /dev/null @@ -1,13 +0,0 @@ -moreutils is a growing collection of the unix tools that nobody -thought to write long ago when unix was young. - -perl-IPC-Run is an optional dependency. If it's missing, chronic will -not be installed. - -The 'parallel' command in moreutils conflicts with Slackware's -parallel package, so the moreutils version of parallel is not -installed by default. To install it: - - PARALLEL=yes ./moreutils.SlackBuild - -Note that this will break the sbopkg 'sqg' command! diff --git a/misc/moreutils/moreutils.SlackBuild b/misc/moreutils/moreutils.SlackBuild deleted file mode 100644 index 75a4c2747b..0000000000 --- a/misc/moreutils/moreutils.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash - -# Slackware build script for moreutils - -# Copyright 2015-2020 Arkadiusz Drabczyk -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=moreutils -VERSION=${VERSION:-0.70} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -else - SLKCFLAGS="-O2" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}-${VERSION}.tar.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 -make install DESTDIR=$PKG - -# Move manpages to /usr/man -mkdir $PKG/usr/man -mv $PKG/usr/share/man/* $PKG/usr/man -rm -rf $PKG/usr/share/ $PKG/usr/man/man1/ts.1 - -if [ "${PARALLEL:-no}" = "no" ]; then - rm -f $PKG/usr/bin/parallel $PKG/usr/man/man1/parallel.1 -fi - -if ! perl -MIPC::Run -e 1 2>/dev/null; then - rm -f $PKG/usr/bin/chronic $PKG/usr/man/man1/chronic.1 -fi - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/moreutils/moreutils.info b/misc/moreutils/moreutils.info deleted file mode 100644 index 9368df4a7c..0000000000 --- a/misc/moreutils/moreutils.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="moreutils" -VERSION="0.70" -HOMEPAGE="https://joeyh.name/code/moreutils" -DOWNLOAD="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/moreutils-0.70.tar.gz" -MD5SUM="f7a5925f51580ed4b79e20028d84a8af" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Arkadiusz Drabczyk" -EMAIL="arkadiusz@drabczyk.org" diff --git a/misc/moreutils/slack-desc b/misc/moreutils/slack-desc deleted file mode 100644 index f4613429fe..0000000000 --- a/misc/moreutils/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -moreutils: moreutils (unix tools) -moreutils: -moreutils: moreutils is a growing collection of the unix tools that nobody -moreutils: thought to write long ago when unix was young -moreutils: -moreutils: -moreutils: -moreutils: -moreutils: -moreutils: -moreutils: https://joeyh.name/code/moreutils diff --git a/misc/projectM/projectM.SlackBuild b/misc/projectM/projectM.SlackBuild index 2d8a69608e..8611d4e030 100644 --- a/misc/projectM/projectM.SlackBuild +++ b/misc/projectM/projectM.SlackBuild @@ -25,7 +25,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=projectM -VERSION=${VERSION:-3.1.12} +VERSION=${VERSION:-4.1.2} +SRCNAM2=projectm-eval +VERSION2=${VERSION2:-1.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,6 +75,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM2-$VERSION2.tar.gz --strip-components=1 -C $SRCNAM-$VERSION/vendor/$SRCNAM2 cd $SRCNAM-$VERSION chown -R root:root . find -L . \ @@ -81,22 +84,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -./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 +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la @@ -104,9 +103,6 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -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.txt LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/misc/projectM/projectM.info b/misc/projectM/projectM.info index 0c4b035b14..6ee7522a06 100644 --- a/misc/projectM/projectM.info +++ b/misc/projectM/projectM.info @@ -1,8 +1,10 @@ PRGNAM="projectM" -VERSION="3.1.12" +VERSION="4.1.2" HOMEPAGE="https://github.com/projectM-visualizer/projectm" -DOWNLOAD="https://github.com/projectM-visualizer/projectm/archive/v3.1.12/projectm-3.1.12.tar.gz" -MD5SUM="8b583aa05d1ab66985fa89d593b480d5" +DOWNLOAD="https://github.com/projectM-visualizer/projectm/archive/v4.1.2/projectm-4.1.2.tar.gz \ + https://github.com/projectM-visualizer/projectm-eval/archive/v1.0.0/projectm-eval-1.0.0.tar.gz" +MD5SUM="74a5d37f7344bd32e5a9d04eb02a1fb4 \ + 1142c430117cd1b9db321a1d25398f23" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/misc/qtspell/qtspell.SlackBuild b/misc/qtspell/qtspell.SlackBuild index 214f2fa9d6..dafca9c822 100644 --- a/misc/qtspell/qtspell.SlackBuild +++ b/misc/qtspell/qtspell.SlackBuild @@ -86,6 +86,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/misc/sdcv/gcc_14-modern_glib2.patch b/misc/sdcv/gcc_14-modern_glib2.patch new file mode 100644 index 0000000000..41632ecefb --- /dev/null +++ b/misc/sdcv/gcc_14-modern_glib2.patch @@ -0,0 +1,40 @@ +From 6ebec7c32dc9f83bf48de654c5d355f8357e25c5 Mon Sep 17 00:00:00 2001 +From: Norayr Chilingarian +Date: Sun, 18 May 2025 13:39:02 +0400 +Subject: [PATCH] Fix build with GCC 14 and modern glib: const correctness and + deprecated API + +- Use 'const gchar*' for result of g_utf8_next_char() to satisfy GCC 14's stricter const rules +- Remove incorrect g_free() on non-allocated pointer from g_utf8_next_char() +- Replace deprecated g_pattern_match_string() with g_pattern_spec_match_string() +--- + src/stardict_lib.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/stardict_lib.cpp b/src/stardict_lib.cpp +index 83fbc59..13cf779 100644 +--- a/src/stardict_lib.cpp ++++ b/src/stardict_lib.cpp +@@ -989,7 +989,7 @@ bool Dict::LookupWithRule(GPatternSpec *pspec, glong *aIndex, int iBuffLen) + int iIndexCount = 0; + + for (guint32 i = 0; i < narticles() && iIndexCount < (iBuffLen - 1); i++) +- if (g_pattern_match_string(pspec, get_key(i))) ++ if (g_pattern_spec_match_string(pspec, get_key(i))) + aIndex[iIndexCount++] = i; + + aIndex[iIndexCount] = -1; // -1 is the end. +@@ -1047,12 +1047,11 @@ bool Libs::LookupSimilarWord(const gchar *sWord, std::set &iWordIndices, + } + // Upper the first character and lower others. + if (!bFound) { +- gchar *nextchar = g_utf8_next_char(sWord); ++ const gchar *nextchar = g_utf8_next_char(sWord); + gchar *firstchar = g_utf8_strup(sWord, nextchar - sWord); + nextchar = g_utf8_strdown(nextchar, -1); + casestr = g_strdup_printf("%s%s", firstchar, nextchar); + g_free(firstchar); +- g_free(nextchar); + if (strcmp(casestr, sWord)) { + if (oLib[iLib]->Lookup(casestr, iWordIndices)) + bFound = true; diff --git a/misc/sdcv/sdcv.SlackBuild b/misc/sdcv/sdcv.SlackBuild index 50c28f0698..b13dfd69c7 100644 --- a/misc/sdcv/sdcv.SlackBuild +++ b/misc/sdcv/sdcv.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sdcv -VERSION=${VERSION:-0.5.3} +VERSION=${VERSION:-0.5.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -74,10 +71,12 @@ 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 {} \; + +patch -p1 < $CWD/gcc_14-modern_glib2.patch mkdir -p build/locale cd build @@ -85,8 +84,6 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release .. make make lang diff --git a/misc/sdcv/sdcv.info b/misc/sdcv/sdcv.info index 08f292fe0c..b295997117 100644 --- a/misc/sdcv/sdcv.info +++ b/misc/sdcv/sdcv.info @@ -1,8 +1,8 @@ PRGNAM="sdcv" -VERSION="0.5.3" +VERSION="0.5.5" HOMEPAGE="https://dushistov.github.io/sdcv/" -DOWNLOAD="https://github.com/Dushistov/sdcv/archive/v0.5.3/sdcv-0.5.3.tar.gz" -MD5SUM="6a75cfe650ce1d0fca229e63278d5c0e" +DOWNLOAD="https://github.com/Dushistov/sdcv/archive/v0.5.5/sdcv-0.5.5.tar.gz" +MD5SUM="265dbfda83a57810595d156877f3e6fd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/misc/seahorse-plugins/README b/misc/seahorse-plugins/README deleted file mode 100644 index 0473d6abe3..0000000000 --- a/misc/seahorse-plugins/README +++ /dev/null @@ -1,2 +0,0 @@ -This package provides plugins for the Seahorse application. -Scrollkeeper and Epiphany support are disabled in this SlackBuild. diff --git a/misc/seahorse-plugins/doinst.sh b/misc/seahorse-plugins/doinst.sh deleted file mode 100644 index 6c4d26e292..0000000000 --- a/misc/seahorse-plugins/doinst.sh +++ /dev/null @@ -1,24 +0,0 @@ -schema_install() { - SCHEMA="$1" - GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \ - chroot . gconftool-2 --makefile-install-rule \ - /etc/gconf/schemas/$SCHEMA \ - 1>/dev/null -} - -schema_install seahorse-plugins.schemas - -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/misc/seahorse-plugins/seahorse-plugins.SlackBuild b/misc/seahorse-plugins/seahorse-plugins.SlackBuild deleted file mode 100644 index a2e67837d5..0000000000 --- a/misc/seahorse-plugins/seahorse-plugins.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - -# Slackware build script for - -# Written by Andrew Rowland - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM='seahorse-plugins' -VERSION=${VERSION:-20150521_3781393eac} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -gnome-doc-prepare --force - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./autogen.sh \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-scrollkeeper \ - --disable-update-mime-database \ - --disable-epiphany \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS ChangeLog COPYING* HACKING INSTALL MAINTAINERS NEWS README THANKS \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/seahorse-plugins/seahorse-plugins.info b/misc/seahorse-plugins/seahorse-plugins.info deleted file mode 100644 index e31433fa00..0000000000 --- a/misc/seahorse-plugins/seahorse-plugins.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="seahorse-plugins" -VERSION="20150521_3781393eac" -HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse/Plugins" -DOWNLOAD="https://harrier.slackbuilds.org/misc/seahorse-plugins-20150521_3781393eac.tar.xz" -MD5SUM="d9bb36048c3b1fc727383e107a94dcec" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gnome-common libcryptui seahorse" -MAINTAINER="Andrew Rowland" -EMAIL="darowland@ieee.org" diff --git a/misc/seahorse-plugins/slack-desc b/misc/seahorse-plugins/slack-desc deleted file mode 100644 index 209e9cbcb7..0000000000 --- a/misc/seahorse-plugins/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -seahorse-plugins: seahorse-plugins (plugins for Seahorse) -seahorse-plugins: -seahorse-plugins: Plugins for the Seahorse application. -seahorse-plugins: -seahorse-plugins: -seahorse-plugins: -seahorse-plugins: -seahorse-plugins: -seahorse-plugins: -seahorse-plugins: -seahorse-plugins: diff --git a/misc/wkhtmltopdf/README b/misc/wkhtmltopdf/README deleted file mode 100644 index 19ec5e29c4..0000000000 --- a/misc/wkhtmltopdf/README +++ /dev/null @@ -1,4 +0,0 @@ -wkhtmltopdf (convert html to pdf using QtWebkit) - -Simple shell utility to convert html to pdf using the webkit -rendering engine, and qt. diff --git a/misc/wkhtmltopdf/slack-desc b/misc/wkhtmltopdf/slack-desc deleted file mode 100644 index 7fba751dcc..0000000000 --- a/misc/wkhtmltopdf/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -wkhtmltopdf: wkhtmltopdf (convert html to pdf using QtWebkit) -wkhtmltopdf: -wkhtmltopdf: Simple shell utility to convert html to pdf using the webkit -wkhtmltopdf: rendering engine, and qt. -wkhtmltopdf: -wkhtmltopdf: -wkhtmltopdf: -wkhtmltopdf: -wkhtmltopdf: -wkhtmltopdf: -wkhtmltopdf: diff --git a/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild b/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild deleted file mode 100644 index 8e0a10713f..0000000000 --- a/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# Slackware build script for wkhtmltopdf - -# Copyright 2011 Vincent Batts, vbatts@hashbangbash.com, http://hashbangbash.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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=wkhtmltopdf -VERSION=${VERSION:-0.12.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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" \ -qmake-qt5 - -make -make install INSTALL_ROOT=$PKG/usr - -if [ "$PKG/usr/lib" != "$PKG/usr/lib${LIBDIRSUFFIX}" ] ; then - mv "$PKG/usr/lib" "$PKG/usr/lib${LIBDIRSUFFIX}" -fi - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/man -mv $PKG/usr/share/man/* $PKG/usr/man/ -rm -rf $PKG/usr/share/ - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CHANGELOG* LICENSE README.md 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 diff --git a/misc/wkhtmltopdf/wkhtmltopdf.info b/misc/wkhtmltopdf/wkhtmltopdf.info deleted file mode 100644 index 1fc1a55137..0000000000 --- a/misc/wkhtmltopdf/wkhtmltopdf.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wkhtmltopdf" -VERSION="0.12.6" -HOMEPAGE="https://wkhtmltopdf.org/" -DOWNLOAD="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/0.12.6/wkhtmltopdf-0.12.6.tar.gz" -MD5SUM="170ce433d1ea62128ca4713b995f8cba" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Vincent Batts" -EMAIL="vbatts@hashbangbash.com" diff --git a/misc/xcb-imdkit/README b/misc/xcb-imdkit/README deleted file mode 100644 index a9aaa69367..0000000000 --- a/misc/xcb-imdkit/README +++ /dev/null @@ -1,8 +0,0 @@ -xcb-imdkit is an implementation of the xim protocol in xcb. Compared -with the implementation of IMDkit with Xlib, and xim inside Xlib, it -has a smaller memory footprint, better performance, and is safer on -malformed clients. And not to say it's all asynchronous and it works -with xcb. - -To build this project, you need: libxcb, xcb-util, xcb-util-keysym, -which are all included in a full Slackware installation. diff --git a/misc/xcb-imdkit/slack-desc b/misc/xcb-imdkit/slack-desc deleted file mode 100644 index 73fec52ff7..0000000000 --- a/misc/xcb-imdkit/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -xcb-imdkit: xcb-imdkit (implementation of the xim protocol in xcb) -xcb-imdkit: -xcb-imdkit: xcb-imdkit is an implementation of the xim protocol in xcb. Compared -xcb-imdkit: with the implementation of IMDkit with Xlib, and xim inside Xlib, it -xcb-imdkit: has a smaller memory footprint, better performance, and is safer on -xcb-imdkit: malformed clients. And not to say it's all asynchronous and it works -xcb-imdkit: with xcb. -xcb-imdkit: -xcb-imdkit: Homepage: https://github.com/fcitx/xcb-imdkit -xcb-imdkit: -xcb-imdkit: diff --git a/misc/xcb-imdkit/xcb-imdkit.SlackBuild b/misc/xcb-imdkit/xcb-imdkit.SlackBuild deleted file mode 100644 index 2e5cf1ae27..0000000000 --- a/misc/xcb-imdkit/xcb-imdkit.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -# Copyright 2022 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=xcb-imdkit -VERSION=${VERSION:-1.0.9} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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.* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* 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 diff --git a/misc/xcb-imdkit/xcb-imdkit.info b/misc/xcb-imdkit/xcb-imdkit.info deleted file mode 100644 index ba6888b679..0000000000 --- a/misc/xcb-imdkit/xcb-imdkit.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="xcb-imdkit" -VERSION="1.0.9" -HOMEPAGE="https://github.com/fcitx/xcb-imdkit" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-1.0.9.tar.zst" -MD5SUM="617b72f1dc02fa7aad3d19a837220f00" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/multimedia/HandBrake/A08-cmake4.patch b/multimedia/HandBrake/A08-cmake4.patch new file mode 100644 index 0000000000..b4dd083b8b --- /dev/null +++ b/multimedia/HandBrake/A08-cmake4.patch @@ -0,0 +1,32 @@ +From b354c009a60bcd6d7fc04014e200a1ee9c45c167 Mon Sep 17 00:00:00 2001 +From: yaswanthsastry +Date: Mon, 24 Feb 2025 17:07:03 +0530 +Subject: [PATCH] Fix CMake build error with latest CMake 4.0 release + +--- + source/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 37dbe1a87..4f5b3ed82 100755 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -7,13 +7,13 @@ if(NOT CMAKE_BUILD_TYPE) + endif() + message(STATUS "cmake version ${CMAKE_VERSION}") + if(POLICY CMP0025) +- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang ++ cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang + endif() + if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH + endif() + if(POLICY CMP0054) +- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted ++ cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted + endif() + + project (x265) +-- +2.48.1 + diff --git a/multimedia/HandBrake/HandBrake.SlackBuild b/multimedia/HandBrake/HandBrake.SlackBuild index fd9efcb7f8..198154c99d 100644 --- a/multimedia/HandBrake/HandBrake.SlackBuild +++ b/multimedia/HandBrake/HandBrake.SlackBuild @@ -176,6 +176,9 @@ index 6ad2852d3..6d25c4112 100644 EOF fi +# Patch x265 for cmake 4 +cp $CWD/A08-cmake4.patch contrib/x265/ + # Make the GUI optional if [ "$GUI" == "no" ]; then GTK_GUI="--disable-gtk" @@ -188,6 +191,8 @@ else patch -Rp1 < $CWD/revert-gtk-4.6-switch.patch fi +export CMAKE_POLICY_VERSION_MINIMUM=3.5 + # libdovi and nvdec/nvenc currently don't compile successfully on my # machine. Feel free to send any suggestions/fixes. # libdovi fails if not forcefully disabled... disabling nvdec/nvenc diff --git a/multimedia/MuseScore/MuseScore.SlackBuild b/multimedia/MuseScore/MuseScore.SlackBuild index 69254eafd5..a9c15bce06 100644 --- a/multimedia/MuseScore/MuseScore.SlackBuild +++ b/multimedia/MuseScore/MuseScore.SlackBuild @@ -89,6 +89,7 @@ cmake .. \ -DCMAKE_MODULE_LINKER_FLAGS_RELEASE="-pthread" \ -DQMAKE=/usr/lib"${LIBDIRSUFFIX}"/qt5/bin/qmake \ -DQT_QMAKE_EXECUTABLE=/usr/lib"${LIBDIRSUFFIX}"/qt5/bin/qmake \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DMUSESCORE_BUILD_MODE=release make install \ diff --git a/multimedia/aom/README b/multimedia/aom/README deleted file mode 100644 index dbddf20cbb..0000000000 --- a/multimedia/aom/README +++ /dev/null @@ -1,7 +0,0 @@ -AOMedia Video 1 (AV1) is an Open Source video codec designed for -video transmission over the Internet. AV1 is planned to surpass -VP9 and also to eventually be a competitor with HEVC/H.265. - -This script builds the encoder aomenc, the decoder aomdec as well -as shared libraries which can be utilised by suitable versions of -both FFmpeg and vlc. diff --git a/multimedia/aom/aom.SlackBuild b/multimedia/aom/aom.SlackBuild deleted file mode 100644 index 1045d3e0a3..0000000000 --- a/multimedia/aom/aom.SlackBuild +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash -# ---------------------------------------------------------------------- -# Slackware build script for aom -# -# Copyright (c) 2018-2023 Andrew Strong, Blue Mountains, Australia. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ---------------------------------------------------------------------- - - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=aom -# The 'official' archive for the aom 3.6.0 release has the git commit in -# the filename, so adjustments are required for a sane Slackware build: -VERSION=${VERSION:-3.6.0} -GITCOMMIT=${GITCOMMIT:-3c65175b1972da4a1992c1dae2365b48d13f9a8d} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 -mkdir -p $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$GITCOMMIT.tar.gz -C $TMP/$PRGNAM-$VERSION -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -cd build - - # I don't build either the HTML or the Latex docs as IMHO at this stage - # of aom development they are still not terribly useful for non-developers. - # To enable these docs change '-DENABLE_DOCS=0' below to '1' to build - # the docs and then uncomment the 'extra docs' section below to install them... - - cmake \ - -G "Unix Makefiles" \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DCMAKE_INSTALL_INCLUDEDIR=include \ - -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_NASM=1 \ - -DENABLE_DOCS=0 \ - -DBUILD_SHARED_LIBS=1 \ - -DENABLE_TESTS=0 \ - ../ - make -j1 - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CHANGELOG LICENSE PATENTS README.md Sample.cfg $PKG/usr/doc/$PRGNAM-$VERSION - -# These are the 'extra docs', more details above... -# mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{html,latex} -# cp -a build/docs/html/* $PKG/usr/doc/$PRGNAM-$VERSION/html -# cp -a build/docs/latex/* $PKG/usr/doc/$PRGNAM-$VERSION/latex - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/aom/aom.info b/multimedia/aom/aom.info deleted file mode 100644 index 815f782382..0000000000 --- a/multimedia/aom/aom.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="aom" -VERSION="3.6.0" -HOMEPAGE="https://aomedia.googlesource.com/aom" -DOWNLOAD="http://www.andrews-corner.org/downloads/aom-3c65175b1972da4a1992c1dae2365b48d13f9a8d.tar.gz" -MD5SUM="4c73a44a710688e8c496b3740ecee84b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andrew Strong" -EMAIL="andrew.david.strong@gmail.com" diff --git a/multimedia/aom/slack-desc b/multimedia/aom/slack-desc deleted file mode 100644 index 981c25fff9..0000000000 --- a/multimedia/aom/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -aom: aom (Open Source Video Codec) -aom: -aom: AOMedia Video 1 (AV1) is designed to be the successor to VP9 and -aom: also to eventually be a direct competitor for HEVC/H.265. -aom: This Slackbuild builds the 'reference' encoder aomenc as well as -aom: the 'reference' decoder aomdec. -aom: -aom: Homepage: https://aomedia.googlesource.com/aom -aom: -aom: -aom: diff --git a/multimedia/avidemux/README b/multimedia/avidemux/README index 39e6cb56a1..75d853d6d1 100644 --- a/multimedia/avidemux/README +++ b/multimedia/avidemux/README @@ -4,5 +4,5 @@ compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. -Optional dependencies are aften, amrnb, jack, nv-codec-headers, -and x265. +Optional dependencies are aften, amrnb, jack, nv-codec-headers, x265 +and vapoursynth. diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild index d7424a2bd1..31e344f0b7 100644 --- a/multimedia/avidemux/avidemux.SlackBuild +++ b/multimedia/avidemux/avidemux.SlackBuild @@ -5,7 +5,7 @@ # Derived from a SlackBuild by Eric Hameleers. # Copyright 2009, 2010, 2011, 2013 Eric Hameleers, Eindhoven, NL # Copyright 2015 John Vogel Corning, NY USA -# Copyright 2017-2022 Matteo Bernardini, Pisa, IT +# Copyright 2017-2025 Matteo Bernardini, Pisa, IT # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -37,8 +37,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=avidemux -VERSION=${VERSION:-2.8.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20250331_0d19581} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,7 +83,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 . \ @@ -94,16 +94,11 @@ find -L . \ # Thanks FreeBSD guys! [[ "$ARCH" = "i586" ]] && \ - zcat $CWD/extra-patch-i386-nosse.patch.gz | patch -p0 + zcat $CWD/extra-patch-i386-nosse.patch.gz | patch -p1 -# 20241205 bkw: API change in x265 between 3.6 and 4.1. A struct field -# used to be a char*, and now it's a char[256]. Only apply if needed. -pkg-config --atleast-version 4.0 x265 && patch -p1 < $CWD/x265-4.1.diff - -sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash || exit 1 sed -i 's|0.19|1.0|' avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt || exit 1 -bash bootStrap.bash --with-core --with-cli --with-plugins +bash bootStrap.bash --with-core --with-cli --with-plugins --enable-qt5 make -C buildCli DESTDIR="$PKG" install make -C buildCore DESTDIR="$PKG" install diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info index 948c45dcc6..d0a5a88a5c 100644 --- a/multimedia/avidemux/avidemux.info +++ b/multimedia/avidemux/avidemux.info @@ -1,8 +1,8 @@ PRGNAM="avidemux" -VERSION="2.8.1" +VERSION="20250331_0d19581" HOMEPAGE="http://avidemux.org" -DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.8.1.tar.gz" -MD5SUM="fee41934cba460ec0fde2a453d5a6307" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/avidemux_20250331_0d19581.tar.xz" +MD5SUM="c98adda49203bf23622ed4819a6c17aa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="faac faad2 libdca x264 xvidcore" diff --git a/multimedia/avidemux/extra-patch-i386-nosse.patch.gz b/multimedia/avidemux/extra-patch-i386-nosse.patch.gz index bb463f527fa892db9d693ea6adb302feee4642b4..c7acbaffc790da610a101bb056f9339bee9faf35 100644 GIT binary patch delta 372 zcmV-)0gL|X0*3<$ABzYGMz^hJ0+9(Gf3=WXPr@)5hOh0f_!4g*v#gyk0dH7j>XNY$ zH{#)@S+-W1z)GOQL-_G_0)a%mGW4e3;mz~DZ6SpK9A(uKvb8Muyn1I2aXQ4IgwZag zqTOk!rF^ybYdcr-xhidMIAU2K^O|1HiQ1 zyPy=T`gUP3Kw#Uzg^;=ArG~81YRz+P{^K*#Qk4j_aVWR|F;kg_Fpln6;*G|kpFWTM zYXk_NOHm7wcoGfMcye>kyfBO(V%byIW$`!-M!}1h262=iY|OmbOua#p_@EYA&UZd5 zgE0_U@}HbqOU<5_g%k)Q*j9D&BW)0+{+<7@3zwK+V1hxT@f)uRn+-HrT{5<9j${)v Sjr=%jHqjRx(TFqk0ssIV5w>*z delta 343 zcmV-d0jU0m1L^_^ABzYG)JjTc0FenEf2B`dZ-OuseIAMb;U>OlSjB2|)4fQPIT8dj zO7`*6G*D&}phk*ri$8v#n2~L7yD#lMIrn@Zgn;cu#M9#42xXee%rF-#%8E$Hdyy!< zGxA+{!g5(;k&;EYF?>Qkwmk1`dU7Y;t_J + #include + #include ++#include + #include + } + +@@ -297,8 +298,14 @@ + c->bit_rate = 64000; + c->sample_rate = 48000; + c->sample_fmt = sampleFmt; +- c->channels = 2; +- c->channel_layout = AV_CH_LAYOUT_STEREO; ++ ++ AVChannelLayout chLayoutStereo; ++ av_channel_layout_default(&chLayoutStereo, 2); ++ if (av_channel_layout_copy(&c->ch_layout, &chLayoutStereo)) { ++ wxLogError("Failed to set 2 channels"); ++ return false; ++ } ++ + if (m_audioStm && avcodec_parameters_from_context(m_audioStm->codecpar, c) < 0) { + wxLogError("Failed to copy encoder parameters to output audio stream"); + return false; +@@ -306,7 +313,7 @@ + + + if (avcodec_open2(c, encoder, NULL) < 0) { +- wxLogError(wxT("Could not open audio codec")); ++ wxLogError("Could not open audio codec"); + return false; + } + +@@ -318,7 +325,10 @@ + + m_audioFrame->nb_samples = c->frame_size; + m_audioFrame->format = c->sample_fmt; +- m_audioFrame->channel_layout = c->channel_layout; ++ if (av_channel_layout_copy(&m_audioFrame->ch_layout, &c->ch_layout) < 0) { ++ wxLogError("Could not open copy channel layout"); ++ return false; ++ } + + int ret = av_frame_get_buffer(m_audioFrame, 0); // allocate the data buffers + if (ret < 0) { +@@ -328,7 +338,7 @@ + ret = av_frame_make_writable(m_audioFrame); + if (ret < 0) + return false; +- for (int i = 0; i < c->channels; i++) { ++ for (int i = 0; i < c->ch_layout.nb_channels; i++) { + uint16_t *samples = (uint16_t*)m_audioFrame->data[i]; + if (samples) { + memset(samples, 0, c->frame_size * av_get_bytes_per_sample(c->sample_fmt)); +@@ -494,30 +504,29 @@ + } + + bool wxFfmpegMediaEncoder::writeAudioFrame() { +- AVPacket pkt = { 0 }; // data and size must be 0; +- int got_packet; +- +- av_init_packet(&pkt); ++ AVPacket* pkt = av_packet_alloc(); + AVCodecContext *c = m_audioCodec; + + m_audioFrame->pts = m_nextAudioPts; + m_nextAudioPts += m_audioFrame->nb_samples; +- encode(c, &pkt, m_audioFrame, &got_packet); ++ ++ int got_packet = 0; ++ encode(c, pkt, m_audioFrame, &got_packet); + if (!got_packet) { +- av_packet_unref(&pkt); ++ av_packet_unref(pkt); + return true; + } + +- pkt.stream_index = m_audioStm->index; ++ pkt->stream_index = m_audioStm->index; + + // write the compressed frame in the media file +- int ret = av_interleaved_write_frame(m_outputCtx, &pkt); ++ int ret = av_interleaved_write_frame(m_outputCtx, pkt); + if (ret < 0) { +- av_packet_unref(&pkt); ++ av_packet_unref(pkt); + print_error("Error while writing audio frame", ret); + return false; + } +- av_packet_unref(&pkt); ++ av_packet_unref(pkt); + return true; + } + +@@ -526,34 +535,33 @@ + + // encode the image + m_picture->pts = m_nextVideoPts++; +- AVPacket pkt; +- av_init_packet(&pkt); +- pkt.data = m_videoOutbuf; +- pkt.size = VIDEO_BUF_SIZE; ++ AVPacket* pkt = av_packet_alloc(); ++ pkt->data = m_videoOutbuf; ++ pkt->size = VIDEO_BUF_SIZE; + + int got_packet = 0; +- int ret = encode(c, &pkt, m_picture, &got_packet); ++ int ret = encode(c, pkt, m_picture, &got_packet); + if (ret < 0) { +- av_packet_unref(&pkt); ++ av_packet_unref(pkt); + print_error("Error while writing video frame", ret); + return false; + } + if (got_packet) { +- if (pkt.pts != (int64_t) AV_NOPTS_VALUE) +- pkt.pts = av_rescale_q(pkt.pts, c->time_base, m_videoStm->time_base); +- if (pkt.dts != (int64_t) AV_NOPTS_VALUE) +- pkt.dts = av_rescale_q(pkt.dts, c->time_base, m_videoStm->time_base); +- pkt.stream_index = m_videoStm->index; ++ if (pkt->pts != (int64_t) AV_NOPTS_VALUE) ++ pkt->pts = av_rescale_q(pkt->pts, c->time_base, m_videoStm->time_base); ++ if (pkt->dts != (int64_t) AV_NOPTS_VALUE) ++ pkt->dts = av_rescale_q(pkt->dts, c->time_base, m_videoStm->time_base); ++ pkt->stream_index = m_videoStm->index; + + // write the compressed frame in the media file +- ret = av_interleaved_write_frame(m_outputCtx, &pkt); ++ ret = av_interleaved_write_frame(m_outputCtx, pkt); + if (ret < 0) { +- av_packet_unref(&pkt); ++ av_packet_unref(pkt); + print_error("Error while writing video frame", ret); + return false; + } + } +- av_packet_unref(&pkt); ++ av_packet_unref(pkt); + return true; + } + diff --git a/multimedia/gmidimonitor/gmidimonitor.SlackBuild b/multimedia/gmidimonitor/gmidimonitor.SlackBuild index 0cfcd90a56..a4797eb23c 100644 --- a/multimedia/gmidimonitor/gmidimonitor.SlackBuild +++ b/multimedia/gmidimonitor/gmidimonitor.SlackBuild @@ -79,6 +79,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|env\ python|env python2|" waf + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./waf configure --prefix=/usr/ diff --git a/multimedia/gpac/ffmpeg7.patch b/multimedia/gpac/ffmpeg7.patch new file mode 100644 index 0000000000..f3838f0eff --- /dev/null +++ b/multimedia/gpac/ffmpeg7.patch @@ -0,0 +1,86 @@ +From 18863aa2176e423dae2a6d7e39ff6ed6a37b2b78 Mon Sep 17 00:00:00 2001 +From: Deniz Ugur <7467169+DenizUgur@users.noreply.github.com> +Date: Tue, 8 Oct 2024 21:41:05 -0400 +Subject: [PATCH] fix: private fields were removed in libavformat >= 61 + +--- + src/filters/ff_dmx.c | 41 ++++++++++++++--------------------------- + 1 file changed, 14 insertions(+), 27 deletions(-) + +diff --git a/src/filters/ff_dmx.c b/src/filters/ff_dmx.c +index 540eb80fc1..a612bee571 100644 +--- a/src/filters/ff_dmx.c ++++ b/src/filters/ff_dmx.c +@@ -2204,7 +2204,6 @@ char *dev_desc = NULL; + static void ffavin_enum_devices(const char *dev_name, Bool is_audio) + { + const AVInputFormat *fmt; +- AVFormatContext *ctx; + + if (!dev_name) return; + fmt = av_find_input_format(dev_name); +@@ -2213,42 +2212,31 @@ static void ffavin_enum_devices(const char *dev_name, Bool is_audio) + if (!fmt || !fmt->priv_class || !AV_IS_INPUT_DEVICE(fmt->priv_class->category)) { + return; + } +- ctx = avformat_alloc_context(); +- if (!ctx) return; +- ctx->iformat = (AVInputFormat *)fmt; +- if (ctx->iformat->priv_data_size > 0) { +- ctx->priv_data = av_mallocz(ctx->iformat->priv_data_size); +- if (!ctx->priv_data) { +- avformat_free_context(ctx); +- return; +- } +- if (ctx->iformat->priv_class) { +- *(const AVClass**)ctx->priv_data = ctx->iformat->priv_class; +- av_opt_set_defaults(ctx->priv_data); +- } +- } else { +- ctx->priv_data = NULL; +- } + + AVDeviceInfoList *dev_list = NULL; +- +- AVDictionary *tmp = NULL; +- av_dict_set(&tmp, "list_devices", "1", 0); +- av_opt_set_dict2(ctx, &tmp, AV_OPT_SEARCH_CHILDREN); +- if (tmp) +- av_dict_free(&tmp); +- +- int res = avdevice_list_devices(ctx, &dev_list); ++ int res = avdevice_list_input_sources(fmt, dev_name, NULL, &dev_list); + if (res<0) { + //device doesn't implement avdevice_list_devices, try loading the context using "list_devices=1" option + if (-res == ENOSYS) { ++ AVFormatContext *ctx = avformat_alloc_context(); ++ if (!ctx) return; ++ + AVDictionary *opts = NULL; + av_dict_set(&opts, "list_devices", "1", 0); + res = avformat_open_input(&ctx, "dummy", FF_IFMT_CAST fmt, &opts); + if (opts) + av_dict_free(&opts); ++ ++#if !defined(__DARWIN__) && !defined(__APPLE__) ++ // FIXME: no-op, permission issues on macOS Sonoma+ ++ if (res>=0) avdevice_list_devices(ctx, &dev_list); ++#endif ++ ++ if (res>=0) avformat_close_input(&ctx); ++ avformat_free_context(ctx); + } +- } else if (!res && dev_list->nb_devices) { ++ } ++ if (!res && dev_list && dev_list->nb_devices) { + if (!dev_desc) { + gf_dynstrcat(&dev_desc, "# Detected devices\n", NULL); + } +@@ -2265,7 +2253,6 @@ static void ffavin_enum_devices(const char *dev_name, Bool is_audio) + } + + if (dev_list) avdevice_free_list_devices(&dev_list); +- avformat_free_context(ctx); + } + + static void ffavin_log_none(void *avcl, int level, const char *fmt, va_list vl) diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild index 34249ff0be..43e8390dba 100644 --- a/multimedia/gpac/gpac.SlackBuild +++ b/multimedia/gpac/gpac.SlackBuild @@ -83,6 +83,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/ffmpeg7.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -90,6 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --cpu=$ARCH \ + --extra-cflags="-fpermissive" \ --enable-pic make make install DESTDIR=$PKG diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild index 67fd880f6c..3a878745de 100644 --- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild +++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gst-plugins-bad-nonfree -# Copyright 2013-2021 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013-2025 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -41,8 +41,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gst-plugins-bad-nonfree -VERSION=${VERSION:-1.18.5} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.26.5} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -100,15 +100,6 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + -# 20250805 bkw: allow building with modern x265. this is an optional -# dependency that wasn't even listed in our README, so it took a while -# to find out it was broken. -patch -p1 < $CWD/new_x265.diff - -# 20250805 bkw: same thing for zxing. this seems utterly useless to me, -# but *shrug*. -patch -p1 < $CWD/new_zxing.diff - # 20220307 bkw: the massive list of -Dfoo=disabled below took a minute # to put together. Notice that shm is *not* in the list, though it # should be. This is because the build fails with -Dshm=disabled. @@ -229,7 +220,22 @@ cd build -Dvulkan=disabled \ -Dwayland=disabled \ -Dwebrtc=disabled \ - -Dwebp=disabled + -Dwebp=disabled \ + -Daes=disabled \ + -Danalyticsoverlay=disabled \ + -Daom=disabled \ + -Dassrender=disabled \ + -Dcodec2json=disabled \ + -Dcodecalpha=disabled \ + -Dcodectimestamper=disabled \ + -Dinsertbin=disabled \ + -Dmse=disabled \ + -Dqroverlay=disabled \ + -Dqsv=disabled \ + -Dtensordecoders=disabled \ + -Dunixfd=disabled \ + -Duvcgadget=disabled \ + -Dzxing=disabled "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info index 43340d39f2..41eb934105 100644 --- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info +++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info @@ -1,8 +1,8 @@ PRGNAM="gst-plugins-bad-nonfree" -VERSION="1.18.5" +VERSION="1.26.5" HOMEPAGE="https://gstreamer.freedesktop.org/" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz" -MD5SUM="4ab1c19c3cf1ba79c20c65f6be78e7fd" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.26.5.tar.xz" +MD5SUM="b4d99dc0fddc0a54d96b0389830f283f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/gst-plugins-bad-nonfree/new_x265.diff b/multimedia/gst-plugins-bad-nonfree/new_x265.diff deleted file mode 100644 index ba44eb14ac..0000000000 --- a/multimedia/gst-plugins-bad-nonfree/new_x265.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur gst-plugins-bad-1.18.5/ext/x265/gstx265enc.c gst-plugins-bad-1.18.5.patched/ext/x265/gstx265enc.c ---- gst-plugins-bad-1.18.5/ext/x265/gstx265enc.c 2021-09-08 15:03:40.879254300 -0400 -+++ gst-plugins-bad-1.18.5.patched/ext/x265/gstx265enc.c 2025-08-05 03:05:25.472399516 -0400 -@@ -942,8 +942,9 @@ - * HEVC uses gbr order - * See spec D.3.28 display_primaries_x and display_primaries_y - */ -- encoder->x265param.masteringDisplayColorVolume = -- g_strdup_printf ("G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)", -+ snprintf(encoder->x265param.masteringDisplayColorVolume, -+ X265_MAX_STRING_SIZE, -+ "G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)", - minfo.display_primaries[1].x, minfo.display_primaries[1].y, - minfo.display_primaries[2].x, minfo.display_primaries[2].y, - minfo.display_primaries[0].x, minfo.display_primaries[0].y, diff --git a/multimedia/gst-plugins-bad-nonfree/new_zxing.diff b/multimedia/gst-plugins-bad-nonfree/new_zxing.diff deleted file mode 100644 index 7d78348363..0000000000 --- a/multimedia/gst-plugins-bad-nonfree/new_zxing.diff +++ /dev/null @@ -1,303 +0,0 @@ -diff -Naur gst-plugins-bad-1.18.5/ext/zxing/gstzxing.cpp gst-plugins-bad-1.18.5.patched/ext/zxing/gstzxing.cpp ---- gst-plugins-bad-1.18.5/ext/zxing/gstzxing.cpp 2021-09-08 15:03:40.879254300 -0400 -+++ gst-plugins-bad-1.18.5.patched/ext/zxing/gstzxing.cpp 2025-08-05 04:32:36.736907205 -0400 -@@ -22,11 +22,11 @@ - * @title: zxing - * - * Detect bar codes in the video streams and send them as element messages to -- * the #GstBus if .#GstZXing:message property is %TRUE. -- * If the .#GstZXing:attach-frame property is %TRUE, the posted barcode message -+ * the #GstBus if #GstZXing:message property is %TRUE. -+ * If the #GstZXing:attach-frame property is %TRUE, the posted barcode message - * includes a sample of the frame where the barcode was detected (Since 1.18). - * -- * The element generate messages named `barcode`. The structure contains these fields: -+ * The element generates messages named `barcode`. The structure contains these fields: - * - * * #GstClockTime `timestamp`: the timestamp of the buffer that triggered the message. - * * gchar * `type`: the symbol type. -@@ -36,14 +36,19 @@ - * * #GstSample `frame`: the frame in which the barcode message was detected, if - * the .#GstZXing:attach-frame property was set to %TRUE (Since 1.18) - * -+ * This element is based on the c++ implementation of zxing which can found -+ * at . -+ * - * ## Example launch lines - * |[ - * gst-launch-1.0 -m v4l2src ! videoconvert ! zxing ! videoconvert ! xvimagesink - * ]| This pipeline will detect barcodes and send them as messages. - * |[ -- * gst-launch-1.0 -m v4l2src ! tee name=t ! queue ! videoconvert ! zxing ! fakesink t. ! queue ! xvimagesink -+ * gst-launch-1.0 -m v4l2src ! tee name=t ! queue ! videoconvert ! zxing ! fakesink t. ! queue ! videoconvert ! xvimagesink - * ]| Same as above, but running the filter on a branch to keep the display in color - * -+ * Since: 1.18 -+ * - */ - - #ifdef HAVE_CONFIG_H -@@ -59,6 +64,7 @@ - - #include "ReadBarcode.h" - #include "TextUtfEncoding.h" -+#include "ZXVersion.h" - - using namespace ZXing; - -@@ -80,7 +86,31 @@ - PROP_FORMAT, - }; - --enum -+/** -+ * GstBarCodeFormat: -+ * -+ * @BARCODE_FORMAT_ALL all format -+ * @BARCODE_FORMAT_AZTEC aztec format -+ * @BARCODE_FORMAT_CODABAR codabar format -+ * @BARCODE_FORMAT_CODE_39 code39 format -+ * @BARCODE_FORMAT_CODE_93 code 93 format -+ * @BARCODE_FORMAT_CODE_128 code 128 format -+ * @BARCODE_FORMAT_DATA_MATRIX data matrix format -+ * @BARCODE_FORMAT_EAN_8 EAN 8 format -+ * @BARCODE_FORMAT_EAN_13 EAN 13 format -+ * @BARCODE_FORMAT_ITF ITF format -+ * @BARCODE_FORMAT_MAXICODE maxicode format -+ * @BARCODE_FORMAT_PDF_417 pdf 417 format -+ * @BARCODE_FORMAT_QR_CODE QR code format -+ * @BARCODE_FORMAT_RSS_14 RSS 14 format -+ * @BARCODE_FORMAT_RSS_EXPANDED RSS expanded format -+ * @BARCODE_FORMAT_UPC_A UPC_A format -+ * @BARCODE_FORMAT_UPC_E UPC_E format -+ * @BARCODE_FORMAT_UPC_EAN_EXTENSION UPC_EAN_EXTENSION format -+ * -+ * Since: 1.18 -+ */ -+typedef enum - { - BARCODE_FORMAT_ALL, - BARCODE_FORMAT_AZTEC, -@@ -100,7 +130,7 @@ - BARCODE_FORMAT_UPC_A, - BARCODE_FORMAT_UPC_E, - BARCODE_FORMAT_UPC_EAN_EXTENSION --}; -+} GstBarCodeFormat; - - static const GEnumValue barcode_formats[] = { - {BARCODE_FORMAT_ALL, "ALL", "all"}, -@@ -137,9 +167,8 @@ - return barcode_format_type; - } - -- - #define ZXING_YUV_CAPS \ -- "{ Y800, I420, YV12, NV12, NV21, Y41B, Y42B, YUV9, YVU9 }" -+ "{ARGB, xRGB, Y444, Y42B, I420, Y41B, YUV9, YV12}" - - - static GstStaticPadTemplate gst_zxing_src_template = -@@ -171,13 +200,16 @@ - gboolean attach_frame; - gboolean rotate; - gboolean faster; -- guint format; -+ ImageFormat image_format; -+ GstBarCodeFormat barcode_format; - }; - - static void gst_zxing_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); - static void gst_zxing_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); -+static gboolean gst_zxing_set_info (GstVideoFilter * vfilter, GstCaps * in, -+ GstVideoInfo * in_info, GstCaps * out, GstVideoInfo * out_info); - static GstFlowReturn gst_zxing_transform_frame_ip (GstVideoFilter * vfilter, - GstVideoFrame * frame); - -@@ -201,27 +233,60 @@ - gobject_class->set_property = gst_zxing_set_property; - gobject_class->get_property = gst_zxing_get_property; - -+ /** -+ * GstZXing::message: -+ * -+ * Post a barcode message for each detected code. -+ * -+ * Since: 1.18 -+ */ - g_object_class_install_property (gobject_class, PROP_MESSAGE, - g_param_spec_boolean ("message", - "message", "Post a barcode message for each detected code", - DEFAULT_MESSAGE, - (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); -- -+ /** -+ * GstZXing::attach-frame: -+ * -+ * Attach a frame dump to each barcode message -+ * -+ * Since: 1.18 -+ */ - g_object_class_install_property (gobject_class, PROP_ATTACH_FRAME, - g_param_spec_boolean ("attach-frame", "Attach frame", - "Attach a frame dump to each barcode message", - DEFAULT_ATTACH_FRAME, - (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); -- -+ /** -+ * GstZXing::try-rotate: -+ * -+ * Try to rotate the frame to detect barcode (slower) -+ * -+ * Since: 1.18 -+ */ - g_object_class_install_property (gobject_class, PROP_TRY_ROTATE, - g_param_spec_boolean ("try-rotate", "Try rotate", - "Try to rotate the frame to detect barcode (slower)", - DEFAULT_TRY_ROTATE, - (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); -+ /** -+ * GstZXing::try-faster: -+ * -+ * Try faster to analyze the frame -+ * -+ * Since: 1.18 -+ */ - g_object_class_install_property (gobject_class, PROP_TRY_FASTER, - g_param_spec_boolean ("try-faster", "Try faster", - "Try faster to analyze the frame", DEFAULT_TRY_FASTER, - (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); -+ /** -+ * GstZXing::format: -+ * -+ * Barcode image format -+ * -+ * Since: 1.18 -+ */ - g_object_class_install_property (gobject_class, PROP_FORMAT, - g_param_spec_enum ("format", "barcode format", "Barcode image format", - GST_TYPE_BARCODE_FORMAT, BARCODE_FORMAT_ALL, -@@ -239,6 +304,10 @@ - - vfilter_class->transform_frame_ip = - GST_DEBUG_FUNCPTR (gst_zxing_transform_frame_ip); -+ vfilter_class->set_info = -+ GST_DEBUG_FUNCPTR (gst_zxing_set_info); -+ -+ gst_type_mark_as_plugin_api (GST_TYPE_BARCODE_FORMAT, (GstPluginAPIFlags)0); - } - - static void -@@ -248,7 +317,8 @@ - zxing->attach_frame = DEFAULT_ATTACH_FRAME; - zxing->rotate = DEFAULT_TRY_ROTATE; - zxing->faster = DEFAULT_TRY_FASTER; -- zxing->format = BARCODE_FORMAT_ALL; -+ zxing->image_format = ImageFormat::None; -+ zxing->barcode_format = BARCODE_FORMAT_ALL; - } - - static void -@@ -274,7 +344,7 @@ - zxing->faster = g_value_get_boolean (value); - break; - case PROP_FORMAT: -- zxing->format = g_value_get_enum (value); -+ zxing->barcode_format = (GstBarCodeFormat)g_value_get_enum (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -305,7 +375,7 @@ - g_value_set_boolean (value, zxing->faster); - break; - case PROP_FORMAT: -- g_value_set_enum (value, zxing->format); -+ g_value_set_enum (value, zxing->barcode_format); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -313,12 +383,46 @@ - } - } - -+static gboolean -+gst_zxing_set_info (GstVideoFilter * vfilter, GstCaps * in, -+ GstVideoInfo * in_info, GstCaps * out, GstVideoInfo * out_info) -+{ -+ GstZXing *zxing = GST_ZXING (vfilter); -+ switch (in_info->finfo->format) { -+ case GST_VIDEO_FORMAT_ARGB: -+ case GST_VIDEO_FORMAT_xRGB: -+ zxing->image_format = ImageFormat::XRGB; -+ break; -+ case GST_VIDEO_FORMAT_Y444: -+ case GST_VIDEO_FORMAT_Y42B: -+ case GST_VIDEO_FORMAT_I420: -+ case GST_VIDEO_FORMAT_Y41B: -+ case GST_VIDEO_FORMAT_YUV9: -+ case GST_VIDEO_FORMAT_YV12: -+ zxing->image_format = ImageFormat::Lum; -+ break; -+ default: -+ zxing->image_format = ImageFormat::None; -+ GST_WARNING_OBJECT (zxing, "This format is not supported %s", gst_video_format_to_string(in_info->finfo->format)); -+ } -+ return TRUE; -+} -+ - static GstFlowReturn - gst_zxing_transform_frame_ip (GstVideoFilter * vfilter, GstVideoFrame * frame) - { - GstZXing *zxing = GST_ZXING (vfilter); - gpointer data; - gint height, width; -+ #if ZXING_VERSION_MAJOR >= 2 && ZXING_VERSION_MINOR >= 2 -+ ReaderOptions hints; -+ #else -+ DecodeHints hints; -+ #endif -+ -+ hints.setTryRotate(zxing->rotate); -+ hints.setTryHarder(!zxing->faster); -+ hints.setFormats(BarcodeFormatFromString (barcode_formats[zxing->barcode_format].value_name)); - - /* all formats we support start with an 8-bit Y plane. zxing doesn't need - * to know about the chroma plane(s) */ -@@ -326,14 +430,15 @@ - width = GST_VIDEO_FRAME_WIDTH (frame); - height = GST_VIDEO_FRAME_HEIGHT (frame); - -- /*Init a grayscale source */ -- auto result = ReadBarcode (width, height, (unsigned char *) data, width, -- { BarcodeFormatFromString (barcode_formats[zxing->format].value_name) }, -- zxing->rotate, !zxing->faster); -+ auto result = ReadBarcode ({(unsigned char *)data, width, height, zxing->image_format}, hints); - if (result.isValid ()) { - GST_DEBUG_OBJECT (zxing, "Symbol found. Text: %s Format: %s", -- TextUtfEncoding::ToUtf8 (result.text ()).c_str (), -+ result.text ().c_str (), -+#if ZXING_VERSION_MAJOR >= 2 -+ ToString (result.format ()).c_str ()); -+#else - ToString (result.format ())); -+#endif - } else { - goto out; - } -@@ -358,9 +463,13 @@ - "timestamp", G_TYPE_UINT64, timestamp, - "stream-time", G_TYPE_UINT64, stream_time, - "running-time", G_TYPE_UINT64, running_time, -+#if ZXING_VERSION_MAJOR >= 2 -+ "type", G_TYPE_STRING, ToString (result.format ()).c_str (), -+#else - "type", G_TYPE_STRING, ToString (result.format ()), -+#endif - "symbol", G_TYPE_STRING, -- TextUtfEncoding::ToUtf8 (result.text ()).c_str (), NULL); -+ result.text ().c_str (), NULL); - - if (zxing->attach_frame) { - /* create a sample from image */ diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild index d5d9e11406..5cfe58a020 100644 --- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild +++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gst-plugins-ugly -# Copyright 2013-2021 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013-2025 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gst-plugins-ugly -VERSION=${VERSION:-1.18.5} +VERSION=${VERSION:-1.26.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -90,8 +87,7 @@ cd build --localstatedir=/var \ --mandir=/usr/man \ --prefix=/usr \ - --sysconfdir=/etc \ - -Dexamples=disabled + --sysconfdir=/etc "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info index 5a55a8aa0f..b6f498327a 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.18.5" +VERSION="1.26.1" HOMEPAGE="https://gstreamer.freedesktop.org/" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz" -MD5SUM="049f90b7a3a72e241ad47564b5cd7a7a" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.26.1.tar.xz" +MD5SUM="323190595d918a5a26729e89848af1ea" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/haruna/haruna.SlackBuild b/multimedia/haruna/haruna.SlackBuild index d4ff0886cd..7212eadc61 100644 --- a/multimedia/haruna/haruna.SlackBuild +++ b/multimedia/haruna/haruna.SlackBuild @@ -73,6 +73,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +patch -p1 < $CWD/mpv-0.38.patch + mkdir build cd build cmake \ diff --git a/multimedia/haruna/mpv-0.38.patch b/multimedia/haruna/mpv-0.38.patch new file mode 100644 index 0000000000..372baa38f1 --- /dev/null +++ b/multimedia/haruna/mpv-0.38.patch @@ -0,0 +1,36 @@ +diff -uar haruna-0.12.3.orig/src/mpv/mpvitem.cpp haruna-0.12.3/src/mpv/mpvitem.cpp +--- haruna-0.12.3.orig/src/mpv/mpvitem.cpp 2023-11-15 20:44:52.000000000 +0200 ++++ haruna-0.12.3/src/mpv/mpvitem.cpp 2024-06-02 13:43:21.945207485 +0300 +@@ -116,6 +116,8 @@ + // setProperty(QStringLiteral("terminal"), InformationSettings::mpvLogging()); + // setProperty(QStringLiteral("msg-level"), QStringLiteral("all=v")); + ++ setProperty(MpvProperties::self()->VO, QStringLiteral("libmpv")); ++ + QString hwdec = PlaybackSettings::useHWDecoding() ? PlaybackSettings::hWDecoding() : QStringLiteral("no"); + setProperty(MpvProperties::self()->HardwareDecoding, hwdec); + setProperty(MpvProperties::self()->VolumeMax, QStringLiteral("100")); +diff -uar haruna-0.12.3.orig/src/mpv/mpvpreview.cpp haruna-0.12.3/src/mpv/mpvpreview.cpp +--- haruna-0.12.3.orig/src/mpv/mpvpreview.cpp 2023-11-15 20:44:52.000000000 +0200 ++++ haruna-0.12.3/src/mpv/mpvpreview.cpp 2024-06-02 13:40:21.902051345 +0300 +@@ -11,6 +11,7 @@ + + MpvPreview::MpvPreview() + { ++ setProperty(MpvProperties::self()->VO, QStringLiteral("libmpv")); + mpv_observe_property(m_mpv, 0, "time-pos", MPV_FORMAT_DOUBLE); + + setProperty(MpvProperties::self()->Mute, true); +diff -uar haruna-0.12.3.orig/src/mpv/mpvproperties.h haruna-0.12.3/src/mpv/mpvproperties.h +--- haruna-0.12.3.orig/src/mpv/mpvproperties.h 2023-11-15 20:44:52.000000000 +0200 ++++ haruna-0.12.3/src/mpv/mpvproperties.h 2024-06-02 13:43:04.678619289 +0300 +@@ -20,6 +20,9 @@ + return &p; + } + ++ Q_PROPERTY(QString VO MEMBER Pause CONSTANT) ++ const QString VO{QStringLiteral("vo")}; ++ + Q_PROPERTY(QString Pause MEMBER Pause CONSTANT) + const QString Pause{QStringLiteral("pause")}; + diff --git a/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild index 0d62385bcf..2cc2777176 100644 --- a/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild +++ b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-gmmlib -VERSION=${VERSION:-21.3.1} +VERSION=${VERSION:-22.7.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -85,6 +85,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -Wno-dev \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/multimedia/intel-gmmlib/intel-gmmlib.info b/multimedia/intel-gmmlib/intel-gmmlib.info index 56c6e5218b..120e16cb9d 100644 --- a/multimedia/intel-gmmlib/intel-gmmlib.info +++ b/multimedia/intel-gmmlib/intel-gmmlib.info @@ -1,8 +1,8 @@ PRGNAM="intel-gmmlib" -VERSION="21.3.1" +VERSION="22.7.2" HOMEPAGE="https://github.com/intel/gmmlib/" -DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-21.3.1/gmmlib-intel-gmmlib-21.3.1.tar.gz" -MD5SUM="e6755c5d0f44e336f298cee9c7c3fdae" +DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-22.7.2/gmmlib-intel-gmmlib-22.7.2.tar.gz" +MD5SUM="d270acb6ad6087e5bd0d617d916e9b2d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/intel-media-driver/intel-media-driver.SlackBuild b/multimedia/intel-media-driver/intel-media-driver.SlackBuild index dfb1b3b30b..f2d52f6d2b 100644 --- a/multimedia/intel-media-driver/intel-media-driver.SlackBuild +++ b/multimedia/intel-media-driver/intel-media-driver.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-media-driver -VERSION=${VERSION:-21.3.5} +VERSION=${VERSION:-25.2.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -84,6 +84,8 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG @@ -95,7 +97,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 CODEOWNERS LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/intel-media-driver/intel-media-driver.info b/multimedia/intel-media-driver/intel-media-driver.info index 9516ea42a4..e69ae095ea 100644 --- a/multimedia/intel-media-driver/intel-media-driver.info +++ b/multimedia/intel-media-driver/intel-media-driver.info @@ -1,10 +1,10 @@ PRGNAM="intel-media-driver" -VERSION="21.3.5" +VERSION="25.2.5" HOMEPAGE="https://github.com/intel/media-driver/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/intel/media-driver/archive/intel-media-21.3.5/media-driver-intel-media-21.3.5.tar.gz" -MD5SUM_x86_64="3ace8aec373b3990acb1e3270e4a9e0b" +DOWNLOAD_x86_64="https://github.com/intel/media-driver/archive/intel-media-25.2.5/media-driver-intel-media-25.2.5.tar.gz" +MD5SUM_x86_64="a035897577b10f8270caacbd68733846" REQUIRES="intel-gmmlib" MAINTAINER="Mario Preksavec" EMAIL="mario at slackware dot hr" diff --git a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild index 2c3f1e67bf..f66fb7476a 100644 --- a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild +++ b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-media-sdk -VERSION=${VERSION:-21.3.5} +VERSION=${VERSION:-23.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -78,6 +78,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + mkdir -p build cd build cmake \ @@ -85,8 +87,11 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_TOOLS:BOOL="ON" \ + -DENABLE_ITT:BOOL="OFF" \ -DENABLE_OPENCL:BOOL="OFF" \ + -DENABLE_WAYLAND:BOOL="ON" \ -DENABLE_X11_DRI3:BOOL="ON" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/multimedia/intel-media-sdk/intel-media-sdk.info b/multimedia/intel-media-sdk/intel-media-sdk.info index 8ac23ebd28..8c2d7f82ad 100644 --- a/multimedia/intel-media-sdk/intel-media-sdk.info +++ b/multimedia/intel-media-sdk/intel-media-sdk.info @@ -1,8 +1,8 @@ PRGNAM="intel-media-sdk" -VERSION="21.3.5" +VERSION="23.2.2" HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK/" -DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-21.3.5/MediaSDK-intel-mediasdk-21.3.5.tar.gz" -MD5SUM="7a71beb6def13ab71348785a8880dd0a" +DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-23.2.2/MediaSDK-intel-mediasdk-23.2.2.tar.gz" +MD5SUM="7f348210213fd4a67466b3a20e4b93d7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/intel-media-sdk/patches/020-intel-media-sdk-libcttmetrics-static-only.patch b/multimedia/intel-media-sdk/patches/020-intel-media-sdk-libcttmetrics-static-only.patch new file mode 100644 index 0000000000..ad2dba8e9a --- /dev/null +++ b/multimedia/intel-media-sdk/patches/020-intel-media-sdk-libcttmetrics-static-only.patch @@ -0,0 +1,12 @@ +--- a/samples/metrics_monitor/CMakeLists.txt ++++ b/samples/metrics_monitor/CMakeLists.txt +@@ -11,8 +11,7 @@ if( PKG_LIBDRM_FOUND AND ("${PKG_LIBDRM_VERSION}" VERSION_GREATER 2.4.91)) + + set(DEPENDENCIES libdrm ) + +- make_library( cttmetrics none shared ) +- make_library( cttmetrics_static none static ) ++ make_library( cttmetrics none static ) + + install( TARGETS cttmetrics LIBRARY DESTINATION ${MFX_SAMPLES_INSTALL_BIN_DIR} ) + diff --git a/multimedia/intel-media-sdk/patches/030-intel-media-sdk-gcc13-fix.patch b/multimedia/intel-media-sdk/patches/030-intel-media-sdk-gcc13-fix.patch new file mode 100644 index 0000000000..8033d0f423 --- /dev/null +++ b/multimedia/intel-media-sdk/patches/030-intel-media-sdk-gcc13-fix.patch @@ -0,0 +1,10 @@ +--- a/api/mfx_dispatch/linux/mfxparser.cpp ++++ b/api/mfx_dispatch/linux/mfxparser.cpp +@@ -23,6 +23,7 @@ + #include + #include + ++#include + #include + + #include "mfxloader.h" diff --git a/multimedia/intel-media-sdk/patches/040-intel-media-sdk-gcc15-fix.patch b/multimedia/intel-media-sdk/patches/040-intel-media-sdk-gcc15-fix.patch new file mode 100644 index 0000000000..55cb688af0 --- /dev/null +++ b/multimedia/intel-media-sdk/patches/040-intel-media-sdk-gcc15-fix.patch @@ -0,0 +1,17 @@ +--- a/samples/sample_vpp/src/sample_vpp_frc_adv.cpp ++++ b/samples/sample_vpp/src/sample_vpp_frc_adv.cpp +@@ -17,6 +17,7 @@ The original version of this sample may + or https://software.intel.com/en-us/media-client-solutions-support. + \**********************************************************************************/ + ++#include + #include + #include "vm/strings_defs.h" + #include "sample_vpp_frc_adv.h" +@@ -212,4 +213,4 @@ mfxU64 FRCAdvancedChecker::GetExpectedP + + } // mfxU64 FRCAdvancedChecker::GetExpectedPTS( mfxU32 frameNumber, mfxU64 timeOffset, mfxU64 timeJump ) + +-/* EOF */ +\ No newline at end of file ++/* EOF */ diff --git a/multimedia/kodi/README b/multimedia/kodi/README index 44352744a8..510a1cf821 100644 --- a/multimedia/kodi/README +++ b/multimedia/kodi/README @@ -28,8 +28,9 @@ directory on your favorite mirror. 3.9.12 and earlier had issues. FINAL NOTE: FFMPEG on 15.0 is too old to be used in kodi v21, so it is using an -internal version of 6.0.1. If you have FFMPEG v6+ installed (probably -mainly -current users), you can have kodi build against the system -version by passing FFMPEG=external when building. System versions of -FFMPEG may need to be recompiled to enable certain functionality like -AV1 after installing dav1d. +internal version of 6.0.1. If you have FFMPEG v6.x installed you can +have kodi build against the system version by passing FFMPEG=external +when building. System versions of FFMPEG may need to be recompiled to +enable certain functionality like AV1 after installing dav1d. +Addendum: ATM ffmpeg 7.x in current is unsupported so you have to +rely on the internal version (updated to 6.1.2). diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild index 9165921c37..7b2e67c4f2 100644 --- a/multimedia/kodi/kodi.SlackBuild +++ b/multimedia/kodi/kodi.SlackBuild @@ -41,7 +41,7 @@ libdvdreadVER=${libdvdreadVER:-6.1.3-Next-Nexus-Alpha2-2} groovyVER=${groovyVER:-4.0.16} comLangVER=${comLangVER:-3.14.0} comTextVER=${comTextVER:-1.11.0} -ffmpegVER=${ffmpegVER:-6.0.1} +ffmpegVER=${ffmpegVER:-6.1.2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -85,6 +85,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/pipewire-1.4.0.patch + # Autodetection of "optional" dependencies sucks. It does not work and # compilation will fail on each of these if not explicitly disabled. # Figured I'd implement my own autodetection instead of requiring @@ -103,6 +105,13 @@ if [ -f /usr/bin/shairplay ] ; then AIRPLAY=ON; else AIRPLAY=OFF; fi PLATFORM="x11 gbm" if pkg-config --exists wayland-client++; then PLATFORM="$PLATFORM wayland"; fi +# Actually now that we have the incompatible ffmpeg 7.x in current +# we need to update the internal version... +echo 'LIBNAME=ffmpeg' > tools/depends/target/ffmpeg/FFMPEG-VERSION +echo 'VERSION=6.1.2' >> tools/depends/target/ffmpeg/FFMPEG-VERSION +echo 'ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz' >> tools/depends/target/ffmpeg/FFMPEG-VERSION +echo 'SHA512=3a009184d971fc3168e1322d1d724aae787ed0e9c152d8d1813ea0b9099bda3b35c41fcabbd7b140560e7a8fa9fa1ffd7f0938432d5d498c43829fc6cc3d9e08' >> tools/depends/target/ffmpeg/FFMPEG-VERSION + mkdir -p $TMP/$PRGNAM-build cd $TMP/$PRGNAM-build @@ -115,7 +124,7 @@ if [ "${FFMPEG}" == "external" ]; then FFMPEGURL="" else FFMPEG="ON" - FFMPEGURL="-DFFMPEG_URL=$CWD/ffmpeg-$ffmpegVER.tar.gz" + FFMPEGURL="-DFFMPEG_URL=$CWD/ffmpeg-$ffmpegVER.tar.xz" fi # There doesn't seem to be a way to specify the url of these files @@ -148,6 +157,7 @@ fi -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DAPP_RENDER_SYSTEM=gl \ -DCORE_PLATFORM_NAME="$PLATFORM" \ + -DENABLE_INTERNAL_FMT=ON \ -DENABLE_INTERNAL_CROSSGUID=ON \ -DENABLE_INTERNAL_FFMPEG=$FFMPEG \ -DENABLE_AIRTUNES=$AIRPLAY \ diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info index 1d38971dc2..17d1c1acbd 100644 --- a/multimedia/kodi/kodi.info +++ b/multimedia/kodi/kodi.info @@ -9,7 +9,7 @@ DOWNLOAD="https://github.com/xbmc/xbmc/archive/refs/tags/21.2-Omega/xbmc-21.2-Om http://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip \ http://mirrors.kodi.tv/build-deps/sources/commons-lang3-3.14.0-bin.tar.gz \ http://mirrors.kodi.tv/build-deps/sources/commons-text-1.11.0-bin.tar.gz \ - http://mirrors.kodi.tv/build-deps/sources/ffmpeg-6.0.1.tar.gz" + https://ffmpeg.org//releases/ffmpeg-6.1.2.tar.xz" MD5SUM="ba191fcbd49e19af50e5c56786bc9bf4 \ d4a8d62f3f8d6d946be75cf5bfa92687 \ 42dc3770ae928103e8033a18b007e79d \ @@ -18,7 +18,7 @@ MD5SUM="ba191fcbd49e19af50e5c56786bc9bf4 \ bd9eb761a11372dd659da8c2cf1ae692 \ 88c83b3fa007ae35d4f82a2466cad423 \ ae1f7607159b192e12f9c8eaaaf3d927 \ - ab9c27629c2a43689c63ff55fd7cbf67" + 42f9bb3aacdd5c5907d1af1811738c00" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk11 libass flatbuffers tinyxml gtest fstrcmp spdlog tinyxml2 libdisplay-info rapidjson" diff --git a/multimedia/kodi/pipewire-1.4.0.patch b/multimedia/kodi/pipewire-1.4.0.patch new file mode 100644 index 0000000000..02942a8830 --- /dev/null +++ b/multimedia/kodi/pipewire-1.4.0.patch @@ -0,0 +1,28 @@ +From e23a105b8988aba9b8401493bf6031a6878bd435 Mon Sep 17 00:00:00 2001 +From: Timo Gurr +Date: Fri, 7 Mar 2025 13:30:47 +0100 +Subject: [PATCH] [AudioEngine] PipeWire: Fix build with PipeWire 1.4.0 + +PipeWire >= 1.4.0 requires the correct struct type to be used, otherwise +it will fail to compile. + +Reference: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/188d920733f0791413d3386e5536ee7377f71b2f +(cherry picked from commit 269053ebbfd3cc4a3156a511f54ab7f08a09a730) +--- + xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp +index bbb4cd9c31746..14d7dcce6d8dc 100644 +--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp ++++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp +@@ -40,7 +40,8 @@ void CPipewireNode::EnumerateFormats() + for (uint32_t param = 0; param < m_info->n_params; param++) + { + if (m_info->params[param].id == SPA_PARAM_EnumFormat) +- pw_node_enum_params(m_proxy.get(), 0, m_info->params[param].id, 0, 0, NULL); ++ pw_node_enum_params(reinterpret_cast(m_proxy.get()), 0, ++ m_info->params[param].id, 0, 0, NULL); + } + } + diff --git a/multimedia/losslesscut-bin/README b/multimedia/losslesscut-bin/README new file mode 100644 index 0000000000..7edfb84667 --- /dev/null +++ b/multimedia/losslesscut-bin/README @@ -0,0 +1,12 @@ +LosslessCut aims to be the ultimate cross platform FFmpeg GUI for +extremely fast and lossless operations on video, audio, subtitle +and other related media files. + +The main feature is lossless trimming and cutting of video and audio +files, which is great for saving space by rough-cutting your large +video files taken from a video camera, GoPro, drone, etc. It lets you +quickly extract the good parts from your videos and discard many +gigabytes of data without doing a slow re-encode and thereby losing +quality. There are also many more use cases. +Everything is extremely fast because it does an almost direct data +copy, fueled by the awesome FFmpeg which does all the grunt work. diff --git a/multimedia/losslesscut-bin/doinst.sh b/multimedia/losslesscut-bin/doinst.sh new file mode 100644 index 0000000000..e4e6459838 --- /dev/null +++ b/multimedia/losslesscut-bin/doinst.sh @@ -0,0 +1,8 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + diff --git a/multimedia/losslesscut-bin/losslesscut-bin.SlackBuild b/multimedia/losslesscut-bin/losslesscut-bin.SlackBuild new file mode 100644 index 0000000000..39d4bf82b4 --- /dev/null +++ b/multimedia/losslesscut-bin/losslesscut-bin.SlackBuild @@ -0,0 +1,77 @@ +#!/bin/bash + +# Slackware build script for losslesscut-bin + +# Copyright 2025 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=losslesscut-bin +SRCNAM=LosslessCut +VERSION=${VERSION:-3.65.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" != "x86_64" ]; then + echo "$ARCH is not supported. Aborting." + exit 1 +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG/usr/{bin,share/$PRGNAM} $OUTPUT +tar xvf $CWD/$SRCNAM-linux-x64.tar.bz2 --strip-components=1 -C $PKG/usr/share/$PRGNAM +chown -R root:root $PKG/usr/share/$PRGNAM + +ln -s /usr/share/$PRGNAM/losslesscut $PKG/usr/bin/$PRGNAM +install -D -m0644 $CWD/resources/icon.svg $PKG/usr/share/pixmaps/$PRGNAM.svg +install -D -m0644 $CWD/resources/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/$PRGNAM/LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION +cp $CWD/resources/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/ +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/losslesscut-bin/losslesscut-bin.info b/multimedia/losslesscut-bin/losslesscut-bin.info new file mode 100644 index 0000000000..ccf58cba19 --- /dev/null +++ b/multimedia/losslesscut-bin/losslesscut-bin.info @@ -0,0 +1,10 @@ +PRGNAM="losslesscut-bin" +VERSION="3.65.0" +HOMEPAGE="https://github.com/mifi/lossless-cut" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/mifi/lossless-cut/releases/download/v3.65.0/LosslessCut-linux-x64.tar.bz2" +MD5SUM_x86_64="171e419f915f7521e4aa93cc5e3713da" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/multimedia/losslesscut-bin/resources/LICENSE b/multimedia/losslesscut-bin/resources/LICENSE new file mode 100644 index 0000000000..692b5e2fa0 --- /dev/null +++ b/multimedia/losslesscut-bin/resources/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Mikael Finstad + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/multimedia/losslesscut-bin/resources/icon.svg b/multimedia/losslesscut-bin/resources/icon.svg new file mode 100644 index 0000000000..8f6b1a2759 --- /dev/null +++ b/multimedia/losslesscut-bin/resources/icon.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/multimedia/losslesscut-bin/resources/losslesscut-bin.desktop b/multimedia/losslesscut-bin/resources/losslesscut-bin.desktop new file mode 100644 index 0000000000..f134ad2947 --- /dev/null +++ b/multimedia/losslesscut-bin/resources/losslesscut-bin.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Name=LosslessCut +Comment=GUI tool for lossless trimming/cutting of media files +Exec=losslesscut-bin +Categories=AudioVideo;AudioVideoEditing; +MimeType=video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/x-flv;video/vnd.rn-realvideo;video/mp4;video/mp4v-es;video/mp2t;application/ogg;application/x-ogg;video/x-ogm+ogg;audio/x-vorbis+ogg;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm; +Icon=losslesscut-bin.svg +Terminal=false +Encoding=UTF-8 +Keywords=trim;codec;cut;movie;mpeg;avi;h264;mkv;mp4; +StartupWMClass=losslesscut-bin diff --git a/multimedia/losslesscut-bin/slack-desc b/multimedia/losslesscut-bin/slack-desc new file mode 100644 index 0000000000..0a2f9aaa27 --- /dev/null +++ b/multimedia/losslesscut-bin/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------------------------------------------------------| +losslesscut-bin: losslesscut-bin (Lossless video editor) +losslesscut-bin: +losslesscut-bin: LosslessCut aims to be the ultimate cross platform FFmpeg GUI for +losslesscut-bin: extremely fast and lossless operations on video, audio, subtitle +losslesscut-bin: and other related media files. +losslesscut-bin: +losslesscut-bin: homepage: https://github.com/mifi/lossless-cut +losslesscut-bin: +losslesscut-bin: +losslesscut-bin: +losslesscut-bin: diff --git a/multimedia/mjpegtools/mjpegtools.SlackBuild b/multimedia/mjpegtools/mjpegtools.SlackBuild index efd32532f9..98d38afff3 100644 --- a/multimedia/mjpegtools/mjpegtools.SlackBuild +++ b/multimedia/mjpegtools/mjpegtools.SlackBuild @@ -84,7 +84,7 @@ find -L . \ sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-template-body" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/multimedia/mkvtoolnix/boost_1.89.patch b/multimedia/mkvtoolnix/boost_1.89.patch new file mode 100644 index 0000000000..bcf450fa52 --- /dev/null +++ b/multimedia/mkvtoolnix/boost_1.89.patch @@ -0,0 +1,109 @@ +From 0ee13882869a9d75a1011c928e36692cf86305a9 Mon Sep 17 00:00:00 2001 +From: Moritz Bunkus +Date: Mon, 11 Aug 2025 22:54:05 +0200 +Subject: [PATCH] =?UTF-8?q?Boost:=20require=20=E2=89=A5=20v1.74.0;=20only?= + =?UTF-8?q?=20require=20header=20for=20boost::system=20library?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +fixes #6143 +--- + NEWS.md | 13 +++++++++++++ + README.md | 2 +- + Rakefile | 1 - + ac/boost.m4 | 10 ++++------ + build-config.in | 1 - + 5 files changed, 18 insertions(+), 9 deletions(-) + +diff --git a/NEWS.md b/NEWS.md +index b92b63540..73cdc88c3 100644 +--- a/NEWS.md ++++ b/NEWS.md +@@ -1,3 +1,16 @@ ++# Version ? ++ ++## Bug fixes ++ ++* build system: fixed building with the upcoming Boost v1.89.0 by only ++ requiring the header part of the Boost.System library as it's been ++ header-only since v1.69.0. Fixes #6143. ++ ++## Build system changes ++ ++* Boost v1.74.0 or newer is now required. ++ ++ + # Version 94.0 "Initiate" 2025-07-27 + + ## New features and enhancements +diff --git a/README.md b/README.md +index 363fd3061..580abac3c 100644 +--- a/README.md ++++ b/README.md +@@ -100,7 +100,7 @@ programs and libraries you absolutely need are: + + - [Boost](http://www.boost.org/) — Several of Boost's libraries are + used, e.g. `filesystem`, `multi-precision`, `operators`, +- `system`. At least v1.66.0 is required. ++ `system`. At least v1.74.0 is required. + + - [libxslt's xsltproc binary](http://xmlsoft.org/libxslt/) and + [DocBook XSL stylesheets](https://sourceforge.net/projects/docbook/files/docbook-xsl/) +diff --git a/Rakefile b/Rakefile +index 8d16961e5..572332cb0 100644 +--- a/Rakefile ++++ b/Rakefile +@@ -1090,7 +1090,6 @@ end + # libraries required for all programs via mtxcommon + $common_libs = [ + :boost_filesystem, +- :boost_system, + :flac, + :z, + :pugixml, +diff --git a/ac/boost.m4 b/ac/boost.m4 +index cef6bcb22..f3341e5fb 100644 +--- a/ac/boost.m4 ++++ b/ac/boost.m4 +@@ -1,5 +1,5 @@ + # boost's headers must be present. +-AX_BOOST_BASE([1.66.0]) ++AX_BOOST_BASE([1.74.0]) + + AC_MSG_CHECKING([for Boost's multi-precision library with GMP backend]) + +@@ -37,7 +37,9 @@ fi + AC_MSG_RESULT([yes]) + + # boost::system must be present. +-AX_BOOST_SYSTEM() ++AX_BOOST_CHECK_HEADERS([boost/system.hpp],,[ ++ AC_MSG_ERROR([Boost's system library is required but wasn't found]) ++]) + + # boost::filesystem must be present. + AX_BOOST_FILESYSTEM() +@@ -46,10 +48,6 @@ if test x"$ax_cv_boost_filesystem" != "xyes"; then + AC_MSG_ERROR(The Boost Filesystem Library was not found.) + fi + +-if test x"$ax_cv_boost_system" != "xyes"; then +- AC_MSG_ERROR(The Boost System Library was not found.) +-fi +- + AX_BOOST_CHECK_HEADERS([boost/operators.hpp],,[ + AC_MSG_ERROR([Boost's Operators library is required but wasn't found]) + ]) +diff --git a/build-config.in b/build-config.in +index 715cc9f8f..117e3877c 100644 +--- a/build-config.in ++++ b/build-config.in +@@ -78,7 +78,6 @@ WINDRES = @WINDRES@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ + BOOST_LDFLAGS = @BOOST_LDFLAGS@ +-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ + CMARK_CFLAGS = @CMARK_CFLAGS@ + CMARK_LIBS = @CMARK_LIBS@ + COMPILER_TYPE = @COMPILER_TYPE@ diff --git a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild index 933ffc8bda..58271a3a06 100644 --- a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild +++ b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mkvtoolnix -VERSION=${VERSION:-80.0} +VERSION=${VERSION:-94.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -78,6 +78,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/boost_1.89.patch +autoreconf -fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/mkvtoolnix/mkvtoolnix.info b/multimedia/mkvtoolnix/mkvtoolnix.info index 4365df658f..57cd86517a 100644 --- a/multimedia/mkvtoolnix/mkvtoolnix.info +++ b/multimedia/mkvtoolnix/mkvtoolnix.info @@ -1,8 +1,8 @@ PRGNAM="mkvtoolnix" -VERSION="80.0" +VERSION="94.0" HOMEPAGE="https://mkvtoolnix.download/" -DOWNLOAD="https://mkvtoolnix.download/sources/mkvtoolnix-80.0.tar.xz" -MD5SUM="464b82fc3903d96298e4dadaae53200f" +DOWNLOAD="https://mkvtoolnix.download/sources/mkvtoolnix-94.0.tar.xz" +MD5SUM="a62a46d918ee7a4cf1d71712390d2cc9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cmark" diff --git a/multimedia/mpv/README b/multimedia/mpv/README deleted file mode 100644 index cb7bc73216..0000000000 --- a/multimedia/mpv/README +++ /dev/null @@ -1,35 +0,0 @@ -mpv is a movie player based on MPlayer and mplayer2. It shares some -features with the former projects while introducing many more. It -supports a wide variety of video file formats, audio and video codecs, -and subtitle types. - -This SlackBuild provides support for the most useful optional features. -Some other optional features may be enabled by having the relevant -packages installed; they will be autodetected at build time. -These include: - jack, libuchardet, oss, rubberband, cudatoolkit, nv-codec-headers - -Please note that CUDA based hardware acceleration requires mpv to be -built with both the cudatoolkit and nv-codec-headers packages installed. - -Since Pipewire is not configured as the default in Slackware, -its use is disabled in this SlackBuild. To enable Pipewire, run the -SlackBuild with the USE_PIPEWIRE environment variable set e.g. - USE_PIPEWIRE=yes sh mpv.SlackBuild - -Most dependencies are autodetected. Some optional dependencies are -disabled by default and may be enabled via the BUILD_OPTS environment -variable. Optional dependencies that are enabled by default may be -disabled in the same way. - -For example, to enable support for OpenAL and SDL2 (both disabled -by default) as well as to disable javascript support (normally -autodetected), you could run: - -BUILD_OPTS="-Dopenal=enabled -Dsdl2=enabled -Djavascript=disabled" \ - bash mpv.SlackBuild - -Runtime support for youtube videos requires installation of youtube-dl -(available from SBo). Watch with something like: - mpv https://www.youtube.com/watch?v=mAFMJ1LnQu8 - diff --git a/multimedia/mpv/doinst.sh b/multimedia/mpv/doinst.sh deleted file mode 100644 index 5ce5efbf40..0000000000 --- a/multimedia/mpv/doinst.sh +++ /dev/null @@ -1,37 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -preserve_perms() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ -e $OLD ]; then - cp -a $OLD ${NEW}.incoming - cat $NEW > ${NEW}.incoming - mv ${NEW}.incoming $NEW - fi - config $NEW -} - -for f in etc/mpv/*.conf.new ; do - preserve_perms $f -done - -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/multimedia/mpv/mpv.SlackBuild b/multimedia/mpv/mpv.SlackBuild deleted file mode 100644 index b80143249e..0000000000 --- a/multimedia/mpv/mpv.SlackBuild +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/bash - -# Slackware build script for mpv - -# Copyright 2015 John Vogel Corning, NY USA -# Copyright 2017,2018 (versions 0.25.0-0.29.1) Andreas Guldstrand -# Copyright 2020-2024 Christoph Willing Sydney Australia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20241009 bkw: Modified by SlackBuilds.org, BUILD=2: -# - Bump BUILD for luajit-2.1.x - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=mpv -VERSION=${VERSION:-0.38.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 {} \; - -DOCS="Copyright LICENSE.GPL LICENSE.LGPL README.md RELEASE_NOTES VERSION" -MANUAL="DOCS/*.md DOCS/*.rst DOCS/*.txt" - -pipewire="-Dpipewire=disabled" ; [ "${USE_PIPEWIRE:-no}" != "no" ] && pipewire="-Dpipewire=auto" - -# This leaves an opening for additional build options. -# See `meson configure` to see what's available. -BUILD_OPTS=${BUILD_OPTS:-""} - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages/ - -CFLAGS="$SLKCFLAGS -ldl" \ -CXXFLAGS="$SLKCFLAGS" \ -meson \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - -Dbuildtype=release \ - -Dmanpage-build=enabled \ - -Dlibmpv=true \ - -Dhtml-build=enabled \ - -Dcdda=enabled \ - -Ddvdnav=enabled \ - -Ddvbin=enabled \ - $pipewire \ - $BUILD_OPTS \ - . build - -DESTDIR=$PKG ${NINJA:=ninja} -C build -v install - -for f in $PKG/etc/mpv/*.conf ; do - mv $f{,.new} -done - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -exec gzip -9 {} \; - for i in $( find $PKG/usr/man -type l ) ; do - ln -s $( readlink $i ).gz $i.gz - rm $i - done -fi - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/manual -for f in $MANUAL; do - cp -a $f $PKG/usr/doc/$PRGNAM-$VERSION/manual/ -done -cp -a $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share/doc -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 diff --git a/multimedia/mpv/mpv.info b/multimedia/mpv/mpv.info deleted file mode 100644 index ba4f43fa4a..0000000000 --- a/multimedia/mpv/mpv.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mpv" -VERSION="0.38.0" -HOMEPAGE="https://mpv.io/" -DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.38.0/mpv-0.38.0.tar.gz" -MD5SUM="7c1a400867e8930f037efc86c1f90a14" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libass libplacebo luajit mujs" -MAINTAINER="Christoph Willing" -EMAIL="chris.willing@linux.com" diff --git a/multimedia/mpv/slack-desc b/multimedia/mpv/slack-desc deleted file mode 100644 index 1dd99eff19..0000000000 --- a/multimedia/mpv/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -mpv: mpv (a movie player based on MPlayer and mplayer2) -mpv: -mpv: mpv is a fork of mplayer2 and MPlayer. It shares some features with -mpv: the former projects while introducing many more. It supports a wide -mpv: variety of video file formats, audio and video codecs, and subtitle -mpv: types. -mpv: -mpv: -mpv: -mpv: mpv homepage: http://mpv.io/ -mpv: diff --git a/multimedia/obs-studio/obs-studio.SlackBuild b/multimedia/obs-studio/obs-studio.SlackBuild index 7017301718..b48f4dbd9f 100644 --- a/multimedia/obs-studio/obs-studio.SlackBuild +++ b/multimedia/obs-studio/obs-studio.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 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done +sed -i '/include "browser-app.hpp"/i #include ' plugins/obs-browser/browser-app.cpp +sed -e 's|-Werror-implicit-function-declaration||g' -i cmake/Modules/CompilerConfig.cmake +sed -e '/-Werror/d' -i cmake/Modules/CompilerConfig.cmake +sed -i '/#include /a #include ' plugins/obs-browser/deps/json11/json11.cpp deps/json11/json11.cpp mkdir -p build cd build diff --git a/multimedia/obs-studio/patches/1_7ed9b1f.patch b/multimedia/obs-studio/patches/1_7ed9b1f.patch new file mode 100644 index 0000000000..438004ea39 --- /dev/null +++ b/multimedia/obs-studio/patches/1_7ed9b1f.patch @@ -0,0 +1,43 @@ +From 7ed9b1f3a6b5e73a39daf906c8e8c19e93fce4b4 Mon Sep 17 00:00:00 2001 +From: Stephen Seo +Date: Wed, 29 Nov 2023 22:06:09 +0900 +Subject: [PATCH] deps/media-playback: Use new (nb_)coded_side_data FFmpeg 6.1 + API + +Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to +allow builds for using older versions of FFmpeg. + +The change in deps/media-playback/media-playback/decode.c is due to +FFmpeg moving "side_data" into AVCodecParameters which is mentioned in +commit [1] in FFmpeg's repository. + +In summary of the "side_data" change, AVStream.side_data is deprecated +and replaced with AVStream.codecpar->coded_side_data, and +AVStream.nb_side_data is replaced with +AVStream.codecpar->nb_coded_side_data. + +[1]: avcodec/codec_par: add side data to AVCodecParameters +https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe +--- + deps/media-playback/media-playback/decode.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/deps/media-playback/media-playback/decode.c b/deps/media-playback/media-playback/decode.c +index 55b91c140ace4..40853f171bde7 100644 +--- a/deps/media-playback/media-playback/decode.c ++++ b/deps/media-playback/media-playback/decode.c +@@ -114,8 +114,14 @@ static uint16_t get_max_luminance(const AVStream *stream) + { + uint32_t max_luminance = 0; + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + for (int i = 0; i < stream->nb_side_data; i++) { + const AVPacketSideData *const sd = &stream->side_data[i]; ++#else ++ for (int i = 0; i < stream->codecpar->nb_coded_side_data; i++) { ++ const AVPacketSideData *const sd = ++ &stream->codecpar->coded_side_data[i]; ++#endif + switch (sd->type) { + case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: { + const AVMasteringDisplayMetadata *mastering = diff --git a/multimedia/obs-studio/patches/2_92fc9f6.patch b/multimedia/obs-studio/patches/2_92fc9f6.patch new file mode 100644 index 0000000000..db0221d0a9 --- /dev/null +++ b/multimedia/obs-studio/patches/2_92fc9f6.patch @@ -0,0 +1,43 @@ +From 92fc9f69ccff2cb12bb8ef877e9238f5d46588a8 Mon Sep 17 00:00:00 2001 +From: Stephen Seo +Date: Wed, 29 Nov 2023 22:08:42 +0900 +Subject: [PATCH] deps/media-playback: In check for key-frame, use new FFmpeg + 6.1 API + +Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to +allow builds for using older versions of FFmpeg. + +AVFrame.key_frame was replaced with a flag in AVFrame.flags. The commit +adding the flag is [1] in FFmpeg's repository, and the deprecation is in +commit [2]. + +In summary of the "key_frame" change, AVFrame.key_frame is deprecated, +and AVFrame.flags indicates with a bit flag if it is a key frame (with +the enum/defined AV_FRAME_FLAG_KEY). + +[1]: avutil/frame: add a keyframe flag to AVFrame +https://github.com/FFmpeg/FFmpeg/commit/cc11191fda0471017b03c1434d6d8cb79f6914e5 + +[2]: avutil/frame: deprecate key_frame +https://github.com/FFmpeg/FFmpeg/commit/3e06f6f04020bef32fa42bc9d7f96e76a46453aa +--- + deps/media-playback/media-playback/media.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/deps/media-playback/media-playback/media.c b/deps/media-playback/media-playback/media.c +index 566eb9e35c9ef..07b040dd8235c 100644 +--- a/deps/media-playback/media-playback/media.c ++++ b/deps/media-playback/media-playback/media.c +@@ -504,7 +504,12 @@ void mp_media_next_video(mp_media_t *m, bool preload) + } + + if (!m->is_local_file && !d->got_first_keyframe) { ++ ++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(58, 29, 100) + if (!f->key_frame) ++#else ++ if (!(f->flags & AV_FRAME_FLAG_KEY)) ++#endif + return; + + d->got_first_keyframe = true; diff --git a/multimedia/obs-studio/patches/3_ed1e079.patch b/multimedia/obs-studio/patches/3_ed1e079.patch new file mode 100644 index 0000000000..d1e435ca9d --- /dev/null +++ b/multimedia/obs-studio/patches/3_ed1e079.patch @@ -0,0 +1,39 @@ +From ed1e0795acde8349ab18b631c545f56e5a3acb9d Mon Sep 17 00:00:00 2001 +From: Stephen Seo +Date: Wed, 29 Nov 2023 20:07:10 +0900 +Subject: [PATCH] libobs: Fence off unnecessary code due to FFmpeg v6.1 changes + +Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to +allow builds for using older versions of FFmpeg. + +This commit prevents obs from using the "fenced" code if using FFmpeg +6.1, since in FFmpeg commit [1] the "side_data" is added to +`AVCodecParameters`, and therefore the existing/following +`avcodec_parameters_copy(...)` will account for the metadata. + +[1]: avcodec/codec_par: add side data to AVCodecParameters +https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe +--- + libobs/media-io/media-remux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libobs/media-io/media-remux.c b/libobs/media-io/media-remux.c +index 7d5eead200012..827d4e59b18ed 100644 +--- a/libobs/media-io/media-remux.c ++++ b/libobs/media-io/media-remux.c +@@ -91,6 +91,7 @@ static inline bool init_output(media_remux_job_t job, const char *out_filename) + return false; + } + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + #if FF_API_BUFFER_SIZE_T + int content_size; + #else +@@ -125,6 +126,7 @@ static inline bool init_output(media_remux_job_t job, const char *out_filename) + mastering_size); + } + } ++#endif + + ret = avcodec_parameters_copy(out_stream->codecpar, + in_stream->codecpar); diff --git a/multimedia/obs-studio/patches/4_6d0381f.patch b/multimedia/obs-studio/patches/4_6d0381f.patch new file mode 100644 index 0000000000..a386f53a3b --- /dev/null +++ b/multimedia/obs-studio/patches/4_6d0381f.patch @@ -0,0 +1,157 @@ +From 6d0381f98ce0a5624901b0042d624ea972a10c2b Mon Sep 17 00:00:00 2001 +From: Stephen Seo +Date: Wed, 29 Nov 2023 20:09:08 +0900 +Subject: [PATCH] obs-ffmpeg: Use new side-data FFmpeg 6.1 API + +Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to +allow builds for using older versions of FFmpeg. + +This commit replaces usage of `av_stream_add_side_data(...)` with +`av_packet_side_data_add(...)`, as the former was deprecated in favor of +the latter. + +The FFmpeg commit that deprecated `av_stream_add_side_data(...)` is [1]. + +The FFmpeg commit that introduced `av_packet_side_data_add(...)` is [2]. + +Note that the deprecation commit is after the new API function. The +commit in between [3] appears to be changes that migrates to the usage +of the new API function. + +[1]: avformat/avformat: use the side data from AVStream.codecpar +https://github.com/FFmpeg/FFmpeg/commit/5432d2aacad5fa7420fe2d9369ed061d521e92d6 + +[2]: avcodec/packet: add generic side data helpers +https://github.com/FFmpeg/FFmpeg/commit/74279227dd28d01b447edb8e617a545982171c2c + +[3]: avcodec/codec_par: add side data to AVCodecParameters +https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe +--- + plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 16 ++++++++++++++++ + plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c | 16 ++++++++++++++++ + plugins/obs-ffmpeg/obs-ffmpeg-output.c | 16 ++++++++++++++++ + 3 files changed, 48 insertions(+) + +diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +index 740b60e5bf46e..8fb84aa7c4e0b 100644 +--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c ++++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +@@ -498,9 +498,17 @@ static void create_video_stream(struct ffmpeg_mux *ffm) + av_content_light_metadata_alloc(&content_size); + content->MaxCLL = max_luminance; + content->MaxFALL = max_luminance; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(ffm->video_stream, + AV_PKT_DATA_CONTENT_LIGHT_LEVEL, + (uint8_t *)content, content_size); ++#else ++ av_packet_side_data_add( ++ &ffm->video_stream->codecpar->coded_side_data, ++ &ffm->video_stream->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content, ++ content_size, 0); ++#endif + + AVMasteringDisplayMetadata *const mastering = + av_mastering_display_metadata_alloc(); +@@ -516,10 +524,18 @@ static void create_video_stream(struct ffmpeg_mux *ffm) + mastering->max_luminance = av_make_q(max_luminance, 1); + mastering->has_primaries = 1; + mastering->has_luminance = 1; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(ffm->video_stream, + AV_PKT_DATA_MASTERING_DISPLAY_METADATA, + (uint8_t *)mastering, + sizeof(*mastering)); ++#else ++ av_packet_side_data_add( ++ &ffm->video_stream->codecpar->coded_side_data, ++ &ffm->video_stream->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_MASTERING_DISPLAY_METADATA, ++ (uint8_t *)mastering, sizeof(*mastering), 0); ++#endif + } + + if (ffm->output->oformat->flags & AVFMT_GLOBALHEADER) +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c +index f33ee77365274..a56dd91bcc38e 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c +@@ -168,9 +168,17 @@ static bool create_video_stream(struct ffmpeg_output *stream, + av_content_light_metadata_alloc(&content_size); + content->MaxCLL = hdr_nominal_peak_level; + content->MaxFALL = hdr_nominal_peak_level; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(data->video, + AV_PKT_DATA_CONTENT_LIGHT_LEVEL, + (uint8_t *)content, content_size); ++#else ++ av_packet_side_data_add( ++ &data->video->codecpar->coded_side_data, ++ &data->video->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content, ++ content_size, 0); ++#endif + + AVMasteringDisplayMetadata *const mastering = + av_mastering_display_metadata_alloc(); +@@ -186,10 +194,18 @@ static bool create_video_stream(struct ffmpeg_output *stream, + mastering->max_luminance = av_make_q(hdr_nominal_peak_level, 1); + mastering->has_primaries = 1; + mastering->has_luminance = 1; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(data->video, + AV_PKT_DATA_MASTERING_DISPLAY_METADATA, + (uint8_t *)mastering, + sizeof(*mastering)); ++#else ++ av_packet_side_data_add( ++ &data->video->codecpar->coded_side_data, ++ &data->video->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_MASTERING_DISPLAY_METADATA, ++ (uint8_t *)mastering, sizeof(*mastering), 0); ++#endif + } + context = avcodec_alloc_context3(NULL); + context->codec_type = codec->type; +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.c b/plugins/obs-ffmpeg/obs-ffmpeg-output.c +index ec02b59cda9d8..c7786153392e5 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-output.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-output.c +@@ -213,9 +213,17 @@ static bool create_video_stream(struct ffmpeg_data *data) + av_content_light_metadata_alloc(&content_size); + content->MaxCLL = hdr_nominal_peak_level; + content->MaxFALL = hdr_nominal_peak_level; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(data->video, + AV_PKT_DATA_CONTENT_LIGHT_LEVEL, + (uint8_t *)content, content_size); ++#else ++ av_packet_side_data_add( ++ &data->video->codecpar->coded_side_data, ++ &data->video->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content, ++ content_size, 0); ++#endif + + AVMasteringDisplayMetadata *const mastering = + av_mastering_display_metadata_alloc(); +@@ -231,10 +239,18 @@ static bool create_video_stream(struct ffmpeg_data *data) + mastering->max_luminance = av_make_q(hdr_nominal_peak_level, 1); + mastering->has_primaries = 1; + mastering->has_luminance = 1; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(data->video, + AV_PKT_DATA_MASTERING_DISPLAY_METADATA, + (uint8_t *)mastering, + sizeof(*mastering)); ++#else ++ av_packet_side_data_add( ++ &data->video->codecpar->coded_side_data, ++ &data->video->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_MASTERING_DISPLAY_METADATA, ++ (uint8_t *)mastering, sizeof(*mastering), 0); ++#endif + } + + closest_format = data->config.format; diff --git a/multimedia/obs-studio/patches/5_ffmpeg-7.patch b/multimedia/obs-studio/patches/5_ffmpeg-7.patch new file mode 100644 index 0000000000..dad98312e9 --- /dev/null +++ b/multimedia/obs-studio/patches/5_ffmpeg-7.patch @@ -0,0 +1,64 @@ +From 8dbad9ac2974f9db776838e3f87c57c15291e983 Mon Sep 17 00:00:00 2001 +From: tytan652 +Date: Sat, 6 Apr 2024 08:50:07 +0200 +Subject: [PATCH] obs-ffmpeg: Fix incompatible-pointer-types with FFmpeg 7 + +--- + plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 5 +++++ + plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c | 18 ++++++++++++------ + 2 files changed, 17 insertions(+), 6 deletions(-) + +diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +index a05c33c942477c..b4e9203bf99828 100644 +--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c ++++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +@@ -886,7 +886,12 @@ static int64_t ffmpeg_mux_seek_av_buffer(void *opaque, int64_t offset, + return 0; + } + ++#if LIBAVFORMAT_VERSION_MAJOR >= 61 ++static int ffmpeg_mux_write_av_buffer(void *opaque, const uint8_t *buf, ++ int buf_size) ++#else + static int ffmpeg_mux_write_av_buffer(void *opaque, uint8_t *buf, int buf_size) ++#endif + { + struct ffmpeg_mux *ffm = opaque; + +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c +index f23bf25c0ec2bc..69ec8a7c25ef4a 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c +@@ -421,6 +421,12 @@ static inline int connect_mpegts_url(struct ffmpeg_output *stream, bool is_rist) + return err; + } + ++#if LIBAVFORMAT_VERSION_MAJOR >= 61 ++typedef int (*write_packet_cb)(void *, const uint8_t *, int); ++#else ++typedef int (*write_packet_cb)(void *, uint8_t *, int); ++#endif ++ + static inline int allocate_custom_aviocontext(struct ffmpeg_output *stream, + bool is_rist) + { +@@ -437,13 +443,13 @@ static inline int allocate_custom_aviocontext(struct ffmpeg_output *stream, + return AVERROR(ENOMEM); + /* allocate custom avio_context */ + if (is_rist) +- s = avio_alloc_context( +- buffer, buffer_size, AVIO_FLAG_WRITE, h, NULL, +- (int (*)(void *, uint8_t *, int))librist_write, NULL); ++ s = avio_alloc_context(buffer, buffer_size, AVIO_FLAG_WRITE, h, ++ NULL, (write_packet_cb)librist_write, ++ NULL); + else +- s = avio_alloc_context( +- buffer, buffer_size, AVIO_FLAG_WRITE, h, NULL, +- (int (*)(void *, uint8_t *, int))libsrt_write, NULL); ++ s = avio_alloc_context(buffer, buffer_size, AVIO_FLAG_WRITE, h, ++ NULL, (write_packet_cb)libsrt_write, ++ NULL); + if (!s) + goto fail; + s->max_packet_size = h->max_packet_size; diff --git a/multimedia/openshot/openshot.info b/multimedia/openshot/openshot.info index 71de86284b..605195d6c6 100644 --- a/multimedia/openshot/openshot.info +++ b/multimedia/openshot/openshot.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/OpenShot/openshot-qt/archive/v3.3.0/openshot-qt-3.3 MD5SUM="8700f53165f105b9838ec711b5f47592" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-pyzmq libopenshot python3-httplib2 jack" +REQUIRES="python3-PyQtWebEngine python3-pyzmq libopenshot python3-httplib2 jack" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" diff --git a/multimedia/shotcut/shotcut.SlackBuild b/multimedia/shotcut/shotcut.SlackBuild index 7b7a27f02c..aa1282c371 100644 --- a/multimedia/shotcut/shotcut.SlackBuild +++ b/multimedia/shotcut/shotcut.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=shotcut -VERSION=${VERSION:-21.12.24} +VERSION=${VERSION:-25.05.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -83,23 +80,20 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix libpng warning. -# [Warning] <> libpng warning: iCCP: profile 'icc': 'RGB ': RGB color space not permitted on grayscale PNG -rm -fR packaging/windows/Microsoft* # avoids find's choking -for i in $(find . -name "*\.png"); do - mv $i ${i}.old.png - convert $i.old.png $i - touch -r ${i}.old.png $i - rm $i.old.png -done +export PATH=/usr/lib$LIBDIRSUFFIX/qt6/bin:$PATH mkdir -p build cd build -qmake PREFIX="/usr" QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \ - CONFIG+=release SHOTCUT_VERSION="$VERSION" DEFINES+=SHOTCUT_NOUPGRADE .. -make -lrelease ../translations/*.ts -make install INSTALL_ROOT=$PKG + cmake -G Ninja \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DSHOTCUT_NOUPGRADE" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ + -DSHOTCUT_VERSION="$VERSION" \ + -DCMAKE_BUILD_TYPE=Release .. + + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/multimedia/shotcut/shotcut.info b/multimedia/shotcut/shotcut.info index 1cf57d99db..b0dc2f6661 100644 --- a/multimedia/shotcut/shotcut.info +++ b/multimedia/shotcut/shotcut.info @@ -1,10 +1,10 @@ PRGNAM="shotcut" -VERSION="21.12.24" +VERSION="25.05.11" HOMEPAGE="https://www.shotcut.org/" -DOWNLOAD="https://github.com/mltframework/shotcut/archive/v21.12.24/shotcut-21.12.24.tar.gz" -MD5SUM="4aa9c69e35b45d33c924376ea518f469" +DOWNLOAD="https://github.com/mltframework/shotcut/archive/v25.05.11/shotcut-25.05.11.tar.gz" +MD5SUM="036807488b5c4e5145a616390b15956f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jack x264 ladspa_sdk" +REQUIRES="jack x264 ladspa_sdk rubberband svt-av1" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" diff --git a/multimedia/spek/spek.SlackBuild b/multimedia/spek/spek.SlackBuild index fdaf7a19ce..7ba9b97c5a 100644 --- a/multimedia/spek/spek.SlackBuild +++ b/multimedia/spek/spek.SlackBuild @@ -30,9 +30,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=spek -VERSION=${VERSION:-0.8.3_07c13da27d} -GITVER=${GITVER:-07c13da27d9c2acfc713c63c21d123cae4b5ce65} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.8.5} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,9 +71,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$GITVER -unzip $CWD/$PRGNAM-$GITVER.zip -cd $PRGNAM-$GITVER +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 \ @@ -82,7 +81,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + -./autogen.sh +GETTEXT_VERSION=$(gettext --version | sed -En '/gettext/ s/^.*runtime\) //p') +sed -i "s/AM_GNU_GETTEXT_VERSION(\[[0-9]\+\.[0-9]\+\])/AM_GNU_GETTEXT_VERSION([$GETTEXT_VERSION])/" configure.ac + +autoreconf -fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/spek/spek.info b/multimedia/spek/spek.info index 6b4fe90afb..d99bae0a02 100644 --- a/multimedia/spek/spek.info +++ b/multimedia/spek/spek.info @@ -1,8 +1,8 @@ PRGNAM="spek" -VERSION="0.8.3_07c13da27d" +VERSION="0.8.5" HOMEPAGE="http://spek.cc" -DOWNLOAD="https://github.com/alexkay/spek/archive/07c13da27d9c2acfc713c63c21d123cae4b5ce65/spek-07c13da27d9c2acfc713c63c21d123cae4b5ce65.zip" -MD5SUM="01d2fedeb747602d9da9bba2480bb220" +DOWNLOAD="https://github.com/alexkay/spek/releases/download/v0.8.5/spek-0.8.5.tar.xz" +MD5SUM="3a23db9d3403e742c78b9bb8cf9e71b3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxGTK3" diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch deleted file mode 100644 index ea737c8b09..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/401287 - ---- filter/filter_pp.c -+++ filter/filter_pp.c -@@ -38,8 +38,8 @@ - - /* FIXME: these use the filter ID as an index--the ID can grow - * arbitrarily large, so this needs to be fixed */ --static pp_mode_t *mode[100]; --static pp_context_t *context[100]; -+static pp_mode *mode[100]; -+static pp_context *context[100]; - static int width[100], height[100]; - static int pre[100]; - diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch deleted file mode 100644 index 871d073fea..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch +++ /dev/null @@ -1,303 +0,0 @@ -Fix build with ffmpeg 0.11. -https://bugs.gentoo.org/show_bug.cgi?id=419551 -Author: Brennan Shacklett - -diff -urN transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c ---- transcode-1.1.7-orig/encode/encode_lavc.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/encode/encode_lavc.c 2012-07-03 10:47:03.528009149 -0700 -@@ -114,6 +114,7 @@ - - AVFrame ff_venc_frame; - AVCodecContext ff_vcontext; -+ AVDictionary ** ff_opts; - - AVCodec *ff_vcodec; - -@@ -1036,14 +1037,10 @@ - SET_FLAG(pd, mv0); - SET_FLAG(pd, cbp); - SET_FLAG(pd, qpel); -- SET_FLAG(pd, alt); -- SET_FLAG(pd, vdpart); - SET_FLAG(pd, naq); - SET_FLAG(pd, ilme); - SET_FLAG(pd, ildct); - SET_FLAG(pd, aic); -- SET_FLAG(pd, aiv); -- SET_FLAG(pd, umv); - SET_FLAG(pd, psnr); - SET_FLAG(pd, trell); - SET_FLAG(pd, gray); -@@ -1064,6 +1061,18 @@ - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; - } -+ if (pd->confdata.flags.alt) { -+ av_dict_set(pd->ff_opts, "alternate_scan", "1", 0); -+ } -+ if (pd->confdata.flags.vdpart) { -+ av_dict_set(pd->ff_opts, "data_partitioning", "1", 0); -+ } -+ if (pd->confdata.flags.umv) { -+ av_dict_set(pd->ff_opts, "umv", "1", 0); -+ } -+ if (pd->confdata.flags.aiv) { -+ av_dict_set(pd->ff_opts, "aiv", "1", 0); -+ } - } - - #undef SET_FLAG -@@ -1184,18 +1193,18 @@ - { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, - { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, - { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, -- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, -+ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, - { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, - { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, -- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART }, -+ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, - #else - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, - #endif -- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV }, -- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV }, -+ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, -+ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, -@@ -1387,7 +1396,7 @@ - pd->confdata.thread_count, - (pd->confdata.thread_count > 1) ?"s" :""); - } -- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count); -+ pd->ff_vcontext.thread_count = pd->confdata.thread_count; - - pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd)); - if (pd->ff_vcodec == NULL) { -@@ -1397,11 +1406,11 @@ - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec); -+ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts); - TC_UNLOCK_LIBAVCODEC; - - if (ret < 0) { -- tc_log_error(MOD_NAME, "avcodec_open() failed"); -+ tc_log_error(MOD_NAME, "avcodec_open2() failed"); - goto failed; - } - /* finally, pass up the extradata, if any */ -diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c ---- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 13:15:23.918019415 -0700 -@@ -122,6 +122,7 @@ - static AVFrame *lavc_convert_frame = NULL; - - static AVCodec *lavc_venc_codec = NULL; -+static AVDictionary **lavc_venc_opts = NULL; - static AVFrame *lavc_venc_frame = NULL; - static AVCodecContext *lavc_venc_context; - static avi_t *avifile = NULL; -@@ -180,7 +181,7 @@ - - - /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ --#include -+#include - #include - #include - -@@ -470,7 +471,6 @@ - } - - TC_LOCK_LIBAVCODEC; -- avcodec_init(); - avcodec_register_all(); - TC_UNLOCK_LIBAVCODEC; - -@@ -634,7 +634,7 @@ - lavc_param_rc_max_rate = 2516; - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; -+ lavc_param_scan_offset = 1; - - break; - -@@ -674,7 +674,7 @@ - - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; -+ lavc_param_scan_offset = 1; - - break; - -@@ -887,7 +887,7 @@ - lavc_venc_context->thread_count); - } - -- avcodec_thread_init(lavc_venc_context, lavc_param_threads); -+ lavc_venc_context->thread_count = lavc_param_threads; - - if (lavc_param_intra_matrix) { - char *tmp; -@@ -1065,15 +1065,10 @@ - lavc_venc_context->flags |= lavc_param_closedgop; - lavc_venc_context->flags |= lavc_param_trunc; - lavc_venc_context->flags |= lavc_param_aic; -- lavc_venc_context->flags |= lavc_param_umv; - lavc_venc_context->flags |= lavc_param_v4mv; -- lavc_venc_context->flags |= lavc_param_data_partitioning; - lavc_venc_context->flags |= lavc_param_cbp; - lavc_venc_context->flags |= lavc_param_mv0; - lavc_venc_context->flags |= lavc_param_qp_rd; -- lavc_venc_context->flags |= lavc_param_scan_offset; -- lavc_venc_context->flags |= lavc_param_ss; -- lavc_venc_context->flags |= lavc_param_alt; - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1203,7 +1198,6 @@ - - lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - -- - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ - if (lavc_param_video_preset) { - avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; -@@ -1241,20 +1235,39 @@ - } - } - -+ if (lavc_param_scan_offset) { -+ av_dict_set(lavc_venc_opts, "scan_offset", "1", 0); -+ } -+ -+ if (lavc_param_ss) { -+ av_dict_set(lavc_venc_opts, "structured_slices", "1", 0); -+ } -+ -+ if (lavc_param_alt) { -+ av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0); -+ } -+ -+ if (lavc_param_umv) { -+ av_dict_set(lavc_venc_opts, "umv", "1", 0); -+ } -+ -+ if (lavc_param_data_partitioning) { -+ av_dict_set(lavc_venc_opts, "vdpart", "1", 0); -+ } - - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(lavc_venc_context, lavc_venc_codec); -+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); - return TC_EXPORT_ERROR; - } - -- if (lavc_venc_context->codec->encode == NULL) { -+ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec " -- "(lavc_venc_context->codec->encode == NULL)"); -+ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)"); - return TC_EXPORT_ERROR; - } - -diff -urN transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c ---- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/export/ffmpeg_cfg.c 2012-07-03 10:09:25.011003254 -0700 -@@ -160,9 +160,9 @@ - {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, -- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, -+ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, -+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -211,7 +211,7 @@ - #else - {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, - #endif -- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, -+ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, -@@ -223,9 +223,9 @@ - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, -- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, -- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, -- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, -+ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, -diff -urN transcode-1.1.7-orig/import/decode_lavc.c transcode-1.1.7/import/decode_lavc.c ---- transcode-1.1.7-orig/import/decode_lavc.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/import/decode_lavc.c 2012-07-03 10:21:46.085005182 -0700 -@@ -181,7 +181,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -urN transcode-1.1.7-orig/import/import_ffmpeg.c transcode-1.1.7/import/import_ffmpeg.c ---- transcode-1.1.7-orig/import/import_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/import/import_ffmpeg.c 2012-07-03 10:19:36.936004841 -0700 -@@ -314,7 +314,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -urN transcode-1.1.7-orig/import/probe_ffmpeg.c transcode-1.1.7/import/probe_ffmpeg.c ---- transcode-1.1.7-orig/import/probe_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/import/probe_ffmpeg.c 2012-07-03 10:41:42.782008306 -0700 -@@ -99,8 +99,8 @@ - - TC_INIT_LIBAVCODEC; - -- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, -- NULL, 0, NULL); -+ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, -+ NULL, NULL); - if (ret != 0) { - tc_log_error(__FILE__, "unable to open '%s'" - " (libavformat failure)", -diff -urN transcode-1.1.7-orig/libtc/tcavcodec.h transcode-1.1.7/libtc/tcavcodec.h ---- transcode-1.1.7-orig/libtc/tcavcodec.h 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/libtc/tcavcodec.h 2012-07-03 10:34:43.648007213 -0700 -@@ -53,7 +53,6 @@ - - #define TC_INIT_LIBAVCODEC do { \ - TC_LOCK_LIBAVCODEC; \ -- avcodec_init(); \ - avcodec_register_all(); \ - TC_UNLOCK_LIBAVCODEC; \ - } while (0) diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg.patch deleted file mode 100644 index be7a6cbaeb..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- encode/encode_lavc.c -+++ encode/encode_lavc.c -@@ -955,8 +955,6 @@ - /* - * context *transcode* (not libavcodec) defaults - */ -- pd->ff_vcontext.mb_qmin = 2; -- pd->ff_vcontext.mb_qmax = 31; - pd->ff_vcontext.max_qdiff = 3; - pd->ff_vcontext.max_b_frames = 0; - pd->ff_vcontext.me_range = 0; -@@ -1116,8 +1114,6 @@ - // handled by transcode core - // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, - // handled by transcode core -- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, -- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, - { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, ---- export/ffmpeg_cfg.c -+++ export/ffmpeg_cfg.c -@@ -34,8 +34,6 @@ - //int lavc_param_vqscale = 0; - //int lavc_param_vqmin = 2; - //int lavc_param_vqmax = 31; --int lavc_param_mb_qmin = 2; --int lavc_param_mb_qmax = 31; - int lavc_param_lmin = 2; - int lavc_param_lmax = 31; - int lavc_param_vqdiff = 3; -@@ -143,8 +141,6 @@ - // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, - {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, - {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, ---- export/ffmpeg_cfg.h -+++ export/ffmpeg_cfg.h -@@ -13,8 +13,6 @@ - //extern int lavc_param_vqscale; - //extern int lavc_param_vqmin; - //extern int lavc_param_vqmax; --extern int lavc_param_mb_qmin; --extern int lavc_param_mb_qmax; - extern int lavc_param_lmin; - extern int lavc_param_lmax; - extern int lavc_param_vqdiff; diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch deleted file mode 100644 index 9a770a6a0d..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch +++ /dev/null @@ -1,557 +0,0 @@ -Fix build with ffmpeg-2.0. -Fix segfaults introduced by wrong usage of the av_dict API. -Fix forgotten parts in the libav9 patch. - -Index: transcode-1.1.7/encode/encode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/encode/encode_lavc.c -+++ transcode-1.1.7/encode/encode_lavc.c -@@ -74,6 +74,9 @@ struct tclavcconfigdata_ { - int lmin; - int lmax; - int me_method; -+ int luma_elim_threshold; -+ int chroma_elim_threshold; -+ int quantizer_noise_shaping; - - /* same as above for flags */ - struct { -@@ -114,7 +117,7 @@ struct tclavcprivatedata_ { - - AVFrame ff_venc_frame; - AVCodecContext ff_vcontext; -- AVDictionary ** ff_opts; -+ AVDictionary * ff_opts; - - AVCodec *ff_vcodec; - -@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou - TC_CODEC_ERROR - }; - -+#if LIBAVCODEC_VERSION_MAJOR < 55 - static const enum CodecID tc_lavc_internal_codecs[] = { - CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4, - CODEC_ID_H263I, CODEC_ID_H263P, -@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern - CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3, - CODEC_ID_NONE - }; -+#else -+static const enum AVCodecID tc_lavc_internal_codecs[] = { -+ AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4, -+ AV_CODEC_ID_H263I, AV_CODEC_ID_H263P, -+ AV_CODEC_ID_H264, -+ AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2, -+ AV_CODEC_ID_RV10, -+ AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1, -+ AV_CODEC_ID_DVVIDEO, -+ AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG, -+ AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3, -+ AV_CODEC_ID_NONE -+}; -+#endif - - static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR }; - -@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL - static void tc_lavc_config_defaults(TCLavcPrivateData *pd) - { - /* first of all reinitialize lavc data */ -+#if LIBAVCODEC_VERSION_MAJOR < 55 - avcodec_get_context_defaults(&pd->ff_vcontext); -+#else -+ avcodec_get_context_defaults3(&pd->ff_vcontext, NULL); -+#endif - - pd->confdata.thread_count = 1; - -@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.mpeg_quant = 0; - pd->ff_vcontext.rc_initial_cplx = 0.0; - pd->ff_vcontext.rc_qsquish = 1.0; -- pd->ff_vcontext.luma_elim_threshold = 0; -- pd->ff_vcontext.chroma_elim_threshold = 0; -+ pd->confdata.luma_elim_threshold = 0; -+ pd->confdata.chroma_elim_threshold = 0; - pd->ff_vcontext.strict_std_compliance = 0; - pd->ff_vcontext.dct_algo = FF_DCT_AUTO; - pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; -@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.noise_reduction = 0; -- pd->ff_vcontext.quantizer_noise_shaping = 0; -+ pd->confdata.quantizer_noise_shaping = 0; - pd->ff_vcontext.flags = 0; - } - -@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC - - pd->ff_vcontext.flags = 0; - SET_FLAG(pd, mv0); -- SET_FLAG(pd, cbp); - SET_FLAG(pd, qpel); - SET_FLAG(pd, naq); - SET_FLAG(pd, ilme); -@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; - } - if (pd->confdata.flags.alt) { -- av_dict_set(pd->ff_opts, "alternate_scan", "1", 0); -+ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); - } - if (pd->confdata.flags.vdpart) { -- av_dict_set(pd->ff_opts, "data_partitioning", "1", 0); -+ av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0); - } - if (pd->confdata.flags.umv) { -- av_dict_set(pd->ff_opts, "umv", "1", 0); -+ av_dict_set(&(pd->ff_opts), "umv", "1", 0); - } - if (pd->confdata.flags.aiv) { -- av_dict_set(pd->ff_opts, "aiv", "1", 0); -+ av_dict_set(&(pd->ff_opts), "aiv", "1", 0); - } -+ if (pd->confdata.flags.cbp) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); -+ } -+ -+ char buf[1024]; -+#define set_dict_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ -+ av_dict_set(&(pd->ff_opts), opt, buf, 0) -+ -+ set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); -+ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); -+ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); - } - - #undef SET_FLAG -@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri - { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, - // { "vrc_init_occupancy", }, // not yet supported - { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, -- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -+ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -+ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, - { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, -@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri - { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, -- { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, -+ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - - { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, -- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, -+ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, -@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns - - pd = self->userdata; - -+ pd->ff_opts = NULL; -+ - pd->flush_flag = vob->encoder_flush; - - /* FIXME: move into core? */ -@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts); -+ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts)); - TC_UNLOCK_LIBAVCODEC; - - if (ret < 0) { -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -122,7 +122,7 @@ static uint8_t *img_buffer = - static AVFrame *lavc_convert_frame = NULL; - - static AVCodec *lavc_venc_codec = NULL; --static AVDictionary **lavc_venc_opts = NULL; -+static AVDictionary *lavc_venc_opts = NULL; - static AVFrame *lavc_venc_frame = NULL; - static AVCodecContext *lavc_venc_context; - static avi_t *avifile = NULL; -@@ -486,7 +486,7 @@ MOD_init - codec->name, codec->fourCC, codec->comments); - } - -- lavc_venc_context = avcodec_alloc_context(); -+ lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); - lavc_venc_frame = avcodec_alloc_frame(); - - lavc_convert_frame= avcodec_alloc_frame(); -@@ -838,8 +838,13 @@ MOD_init - lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; - lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; - lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; -- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; -- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; -+ -+ char buf[1024]; -+#define set_dict_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%i", val); \ -+ av_dict_set(&lavc_venc_opts, opt, buf, 0) -+ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); -+ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); - lavc_venc_context->rtp_payload_size = lavc_param_packet_size; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - if (lavc_param_packet_size) -@@ -870,7 +875,7 @@ MOD_init - lavc_venc_context->context_model = lavc_param_context; - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; - lavc_venc_context->noise_reduction = lavc_param_noise_reduction; -- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; -+ set_dict_opt(lavc_param_inter_threshold, "inter_threshold"); - lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; - lavc_venc_context->skip_top = lavc_param_skip_top; - lavc_venc_context->skip_bottom = lavc_param_skip_bottom; -@@ -1066,9 +1071,11 @@ MOD_init - lavc_venc_context->flags |= lavc_param_trunc; - lavc_venc_context->flags |= lavc_param_aic; - lavc_venc_context->flags |= lavc_param_v4mv; -- lavc_venc_context->flags |= lavc_param_cbp; -+ if(lavc_param_cbp) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0); - lavc_venc_context->flags |= lavc_param_mv0; -- lavc_venc_context->flags |= lavc_param_qp_rd; -+ if(lavc_param_qp_rd) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1238,29 +1245,29 @@ MOD_init - } - - if (lavc_param_scan_offset) { -- av_dict_set(lavc_venc_opts, "scan_offset", "1", 0); -+ av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0); - } - - if (lavc_param_ss) { -- av_dict_set(lavc_venc_opts, "structured_slices", "1", 0); -+ av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0); - } - - if (lavc_param_alt) { -- av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0); -+ av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0); - } - - if (lavc_param_umv) { -- av_dict_set(lavc_venc_opts, "umv", "1", 0); -+ av_dict_set(&lavc_venc_opts, "umv", "1", 0); - } - - if (lavc_param_data_partitioning) { -- av_dict_set(lavc_venc_opts, "vdpart", "1", 0); -+ av_dict_set(&lavc_venc_opts, "vdpart", "1", 0); - } - - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts); -+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); -Index: transcode-1.1.7/export/ffmpeg_cfg.c -=================================================================== ---- transcode-1.1.7.orig/export/ffmpeg_cfg.c -+++ transcode-1.1.7/export/ffmpeg_cfg.c -@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={ - {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, - {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, -- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, -+ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, -- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, -+ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, - {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, -Index: transcode-1.1.7/export/aud_aux.c -=================================================================== ---- transcode-1.1.7.orig/export/aud_aux.c -+++ transcode-1.1.7/export/aud_aux.c -@@ -326,10 +326,18 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec) - - switch (o_codec) { - case 0x50: -+#if LIBAVCODEC_VERSION_MAJOR < 55 - codeid = CODEC_ID_MP2; -+#else -+ codeid = AV_CODEC_ID_MP2; -+#endif - break; - case 0x2000: -+#if LIBAVCODEC_VERSION_MAJOR < 55 - codeid = CODEC_ID_AC3; -+#else -+ codeid = AV_CODEC_ID_AC3; -+#endif - break; - default: - tc_warn("cannot init ffmpeg with %x", o_codec); -@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v - - //-- set parameters (bitrate, channels and sample-rate) -- - //-------------------------------------------------------- -- avcodec_get_context_defaults(&mpa_ctx); -+ avcodec_get_context_defaults3(&mpa_ctx, mpa_codec); - #if LIBAVCODEC_VERSION_MAJOR < 53 - mpa_ctx.codec_type = CODEC_TYPE_AUDIO; - #else -@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(&mpa_ctx, mpa_codec); -+ ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", -@@ -371,7 +371,12 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec) - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", -- (codeid == CODEC_ID_MP2) ?"mpa" :"ac3"); -+#if LIBAVCODEC_VERSION_MAJOR < 55 -+ (codeid == CODEC_ID_MP2) -+#else -+ (codeid == AV_CODEC_ID_MP2) -+#endif -+ ?"mpa" :"ac3"); - return(TC_EXPORT_ERROR); - } - -Index: transcode-1.1.7/import/import_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/import_ffmpeg.c -+++ transcode-1.1.7/import/import_ffmpeg.c -@@ -58,6 +58,7 @@ struct ffmpeg_codec { - }; - - // fourCC to ID mapping taken from MPlayer's codecs.conf -+#if LIBAVCODEC_VERSION_MAJOR < 55 - static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", - {"MP41", "DIV1", ""}}, -@@ -106,6 +107,56 @@ static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", - {"Y42B", ""}}, - {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#else -+static struct ffmpeg_codec ffmpeg_codecs[] = { -+ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", -+ {"MP41", "DIV1", ""}}, -+ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", -+ {"MP42", "DIV2", ""}}, -+ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", -+ {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, -+ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", -+ {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, -+ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", -+ {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, -+ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", -+ {"MPG1", ""}}, -+ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", -+ {"DVSD", ""}}, -+ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", -+ {"WMV1", ""}}, -+ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", -+ {"WMV2", ""}}, -+ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", -+ {"HFYU", ""}}, -+ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", -+ {"I263", ""}}, -+ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", -+ {"H263", "U263", "VIV1", ""}}, -+ {AV_CODEC_ID_H264, TC_CODEC_H264, "h264", -+ {"H264", "h264", "X264", "x264", "avc1", ""}}, -+ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", -+ {"RV10", "RV13", ""}}, -+ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", -+ {"SVQ1", ""}}, -+ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", -+ {"SVQ3", ""}}, -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", -+ {"MPG2", ""}}, -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", -+ {"MPG2", ""}}, -+ {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", -+ {"ASV1", ""}}, -+ {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", -+ {"ASV2", ""}}, -+ {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", -+ {"FFV1", ""}}, -+ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", -+ {"I420", "IYUV", ""}}, -+ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", -+ {"Y42B", ""}}, -+ {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#endif - - #define BUFFER_SIZE SIZE_RGB_FRAME - -@@ -302,7 +302,7 @@ do_avi: - - // Set these to the expected values so that ffmpeg's decoder can - // properly detect interlaced input. -- lavc_dec_context = avcodec_alloc_context(); -+ lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec); - if (lavc_dec_context == NULL) { - tc_log_error(MOD_NAME, "Could not allocate enough memory."); - return TC_IMPORT_ERROR; -@@ -324,6 +375,7 @@ do_avi: - // XXX: some codecs need extra data - switch (codec->id) - { -+#if LIBAVCODEC_VERSION_MAJOR < 55 - case CODEC_ID_MJPEG: extra_data_size = 28; break; - case CODEC_ID_LJPEG: extra_data_size = 28; break; - case CODEC_ID_HUFFYUV: extra_data_size = 1000; break; -@@ -331,6 +383,15 @@ do_avi: - case CODEC_ID_ASV2: extra_data_size = 8; break; - case CODEC_ID_WMV1: extra_data_size = 4; break; - case CODEC_ID_WMV2: extra_data_size = 4; break; -+#else -+ case AV_CODEC_ID_MJPEG: extra_data_size = 28; break; -+ case AV_CODEC_ID_LJPEG: extra_data_size = 28; break; -+ case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break; -+ case AV_CODEC_ID_ASV1: extra_data_size = 8; break; -+ case AV_CODEC_ID_ASV2: extra_data_size = 8; break; -+ case AV_CODEC_ID_WMV1: extra_data_size = 4; break; -+ case AV_CODEC_ID_WMV2: extra_data_size = 4; break; -+#endif - default: extra_data_size = 0; break; - } - -@@ -344,7 +344,7 @@ do_avi: - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(lavc_dec_context, lavc_dec_codec); -+ ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.", -@@ -360,7 +421,11 @@ do_avi: - frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim); - - // we adapt the color space -+#if LIBAVCODEC_VERSION_MAJOR < 55 - if(codec->id == CODEC_ID_MJPEG) { -+#else -+ if(codec->id == AV_CODEC_ID_MJPEG) { -+#endif - enable_levels_filter(); - } - break; -@@ -434,7 +499,11 @@ do_dv: - } - - // we adapt the color space -+#if LIBAVCODEC_VERSION_MAJOR < 55 - if(codec->id == CODEC_ID_MJPEG) { -+#else -+ if(codec->id == AV_CODEC_ID_MJPEG) { -+#endif - enable_levels_filter(); - } - -@@ -504,13 +573,25 @@ MOD_decode { - int bkey = 0; - - // check for keyframes -+#if LIBAVCODEC_VERSION_MAJOR < 55 - if (codec->id == CODEC_ID_MSMPEG4V3) { -+#else -+ if (codec->id == AV_CODEC_ID_MSMPEG4V3) { -+#endif - if (divx3_is_key(buffer)) bkey = 1; - } -+#if LIBAVCODEC_VERSION_MAJOR < 55 - else if (codec->id == CODEC_ID_MPEG4) { -+#else -+ else if (codec->id == AV_CODEC_ID_MPEG4) { -+#endif - if (mpeg4_is_key(buffer, bytes_read)) bkey = 1; - } -+#if LIBAVCODEC_VERSION_MAJOR < 55 - else if (codec->id == CODEC_ID_MJPEG) { -+#else -+ else if (codec->id == AV_CODEC_ID_MJPEG) { -+#endif - bkey = 1; - } - ---- a/import/decode_lavc.c -+++ b/import/decode_lavc.c -@@ -57,6 +57,7 @@ struct ffmpeg_codec { - }; - - // fourCC to ID mapping taken from MPlayer's codecs.conf -+#if LIBAVCODEC_VERSION_MAJOR < 55 - static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", - {"MP41", "DIV1", ""}}, -@@ -91,6 +92,42 @@ static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", - {"MPG2", ""}}, - {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#else -+static struct ffmpeg_codec ffmpeg_codecs[] = { -+ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", -+ {"MP41", "DIV1", ""}}, -+ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", -+ {"MP42", "DIV2", ""}}, -+ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", -+ {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, -+ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", -+ {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, -+ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", -+ {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, -+ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", -+ {"MPG1", ""}}, -+ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", -+ {"DVSD", ""}}, -+ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", -+ {"WMV1", ""}}, -+ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", -+ {"WMV2", ""}}, -+ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", -+ {"HFYU", ""}}, -+ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", -+ {"I263", ""}}, -+ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", -+ {"H263", "U263", "VIV1", ""}}, -+ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", -+ {"RV10", "RV13", ""}}, -+ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", -+ {"SVQ1", ""}}, -+ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", -+ {"SVQ3", ""}}, -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", -+ {"MPG2", ""}}, -+ {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#endif - - - static struct ffmpeg_codec *find_ffmpeg_codec_id(unsigned int transcode_id) diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch deleted file mode 100644 index 57a91774ab..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=520190 - -Index: transcode-1.1.7/import/probe_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/probe_ffmpeg.c -+++ transcode-1.1.7/import/probe_ffmpeg.c -@@ -120,7 +120,11 @@ void probe_ffmpeg(info_t *ipipe) - - translate_info(lavf_dmx_context, ipipe->probe_info); - -+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0) -+ avformat_close_input(&lavf_dmx_context); -+#else - av_close_input_file(lavf_dmx_context); -+#endif - return; - } - diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch deleted file mode 100644 index 7901fc3cc3..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch +++ /dev/null @@ -1,352 +0,0 @@ -Index: transcode-1.1.7/encode/encode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/encode/encode_lavc.c -+++ transcode-1.1.7/encode/encode_lavc.c -@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL - vframe_list_t *vframe) - { - avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, -- PIX_FMT_YUV420P, -+ AV_PIX_FMT_YUV420P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - } - -@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf - IMG_YUV_DEFAULT, - pd->ff_vcontext.width, pd->ff_vcontext.height); - avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, -- PIX_FMT_YUV422P, -+ AV_PIX_FMT_YUV422P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - ac_imgconvert(src, IMG_YUV_DEFAULT, - pd->ff_venc_frame.data, IMG_YUV422P, -@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL - IMG_YUV422P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, -- PIX_FMT_YUV420P, -+ AV_PIX_FMT_YUV420P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - ac_imgconvert(src, IMG_YUV422P, - pd->ff_venc_frame.data, IMG_YUV420P, -@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf - vframe_list_t *vframe) - { - avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, -- PIX_FMT_YUV422P, -+ AV_PIX_FMT_YUV422P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - - } -@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav - vframe_list_t *vframe) - { - avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, -- PIX_FMT_YUV420P, -+ AV_PIX_FMT_YUV420P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT, - pd->ff_venc_frame.data, IMG_YUV420P, -@@ -610,21 +610,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri - case CODEC_YUV: - if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { - pd->tc_pix_fmt = TC_CODEC_YUV422P; -- pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P; -+ pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P; - pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv; - } else { - pd->tc_pix_fmt = TC_CODEC_YUV420P; - pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) -- ? PIX_FMT_YUVJ420P -- : PIX_FMT_YUV420P; -+ ? AV_PIX_FMT_YUVJ420P -+ : AV_PIX_FMT_YUV420P; - pd->pre_encode_video = pre_encode_video_yuv420p; - } - break; - case CODEC_YUV422: - pd->tc_pix_fmt = TC_CODEC_YUV422P; - pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) -- ? PIX_FMT_YUVJ422P -- : PIX_FMT_YUV422P; -+ ? AV_PIX_FMT_YUVJ422P -+ : AV_PIX_FMT_YUV422P; - if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { - pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv; - } else { -@@ -634,10 +634,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri - case CODEC_RGB: - pd->tc_pix_fmt = TC_CODEC_RGB; - pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) -- ? PIX_FMT_YUV422P -+ ? AV_PIX_FMT_YUV422P - : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) -- ? PIX_FMT_YUVJ420P -- : PIX_FMT_YUV420P; -+ ? AV_PIX_FMT_YUVJ420P -+ : AV_PIX_FMT_YUV420P; - pd->pre_encode_video = pre_encode_video_rgb24; - break; - default: -@@ -1390,7 +1390,7 @@ static int tc_lavc_configure(TCModuleIns - /* FIXME: move into core? */ - TC_INIT_LIBAVCODEC; - -- avcodec_get_frame_defaults(&pd->ff_venc_frame); -+ av_frame_unref(&pd->ff_venc_frame); - /* - * auxiliary config data needs to be blanked too - * before any other operation -@@ -1523,6 +1523,8 @@ static int tc_lavc_encode_video(TCModule - vframe_list_t *outframe) - { - TCLavcPrivateData *pd = NULL; -+ AVPacket pkt; -+ int ret, got_packet = 0; - - TC_MODULE_SELF_CHECK(self, "encode_video"); - -@@ -1537,12 +1539,15 @@ static int tc_lavc_encode_video(TCModule - - pd->pre_encode_video(pd, inframe); - -+ av_init_packet(&pkt); -+ pkt.data = outframe->video_buf; -+ pkt.size = inframe->video_size; -+ - TC_LOCK_LIBAVCODEC; -- outframe->video_len = avcodec_encode_video(&pd->ff_vcontext, -- outframe->video_buf, -- inframe->video_size, -- &pd->ff_venc_frame); -+ ret = avcodec_encode_video2(&pd->ff_vcontext, &pkt, -+ &pd->ff_venc_frame, &got_packet); - TC_UNLOCK_LIBAVCODEC; -+ outframe->video_len = ret ? ret : pkt.size; - - if (outframe->video_len < 0) { - tc_log_warn(MOD_NAME, "encoder error: size (%i)", -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -250,9 +250,9 @@ int opt_default(const char *opt, const c - for(type=0; type= 0; type++){ - /* GLUE: +if */ - if (type == AVMEDIA_TYPE_VIDEO) { -- const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); -- if(o2) -- ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o); -+ o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); -+ if(o) -+ ret = av_opt_set(avcodec_opts[type], opt, arg, 0); - /* GLUE: +if */ - } - } -@@ -267,7 +267,10 @@ int opt_default(const char *opt, const c - if(opt[0] == 'a') - ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o); - else */ if(opt[0] == 'v') -- ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o); -+ { -+ o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0); -+ ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0); -+ } - /* GLUE: disabling - else if(opt[0] == 's') - ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o); -@@ -487,10 +490,10 @@ MOD_init - } - - lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); -- lavc_venc_frame = avcodec_alloc_frame(); -+ lavc_venc_frame = av_frame_alloc(); - -- lavc_convert_frame= avcodec_alloc_frame(); -- size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); -+ lavc_convert_frame= av_frame_alloc(); -+ size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); - enc_buffer = tc_malloc(size); - - if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) { -@@ -1114,7 +1117,7 @@ MOD_init - lavc_venc_context->prediction_method = lavc_param_prediction_method; - - if(is_huffyuv) -- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; - else - { - switch(pix_fmt) -@@ -1123,18 +1126,18 @@ MOD_init - case CODEC_RGB: - { - if(is_mjpeg) -- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P; - else -- lavc_venc_context->pix_fmt = PIX_FMT_YUV420P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P; - break; - } - - case CODEC_YUV422: - { - if(is_mjpeg) -- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P; - else -- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; - break; - } - -@@ -1596,6 +1599,8 @@ MOD_encode - - int out_size; - const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'}; -+ AVPacket pkt; -+ int ret, got_packet = 0; - - if (param->flag == TC_VIDEO) { - -@@ -1620,7 +1625,7 @@ MOD_encode - YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT, - lavc_venc_context->width, lavc_venc_context->height); - avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, -- PIX_FMT_YUV422P, lavc_venc_context->width, -+ AV_PIX_FMT_YUV422P, lavc_venc_context->width, - lavc_venc_context->height); - /* FIXME: can't use tcv_convert (see decode_lavc.c) */ - ac_imgconvert(src, IMG_YUV_DEFAULT, -@@ -1650,7 +1655,7 @@ MOD_encode - lavc_venc_context->width, - lavc_venc_context->height); - avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, -- PIX_FMT_YUV420P, lavc_venc_context->width, -+ AV_PIX_FMT_YUV420P, lavc_venc_context->width, - lavc_venc_context->height); - ac_imgconvert(src, IMG_YUV422P, - lavc_venc_frame->data, IMG_YUV420P, -@@ -1661,7 +1666,7 @@ MOD_encode - - case CODEC_RGB: - avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, -- PIX_FMT_YUV420P, lavc_venc_context->width, -+ AV_PIX_FMT_YUV420P, lavc_venc_context->width, - lavc_venc_context->height); - ac_imgconvert(¶m->buffer, IMG_RGB_DEFAULT, - lavc_venc_frame->data, IMG_YUV420P, -@@ -1674,13 +1679,17 @@ MOD_encode - return TC_EXPORT_ERROR; - } - -+ av_init_packet(&pkt); -+ pkt.data = enc_buffer; -+ pkt.size = size; - - TC_LOCK_LIBAVCODEC; -- out_size = avcodec_encode_video(lavc_venc_context, -- enc_buffer, size, -- lavc_venc_frame); -+ ret = avcodec_encode_video2(lavc_venc_context, &pkt, -+ lavc_venc_frame, &got_packet); - TC_UNLOCK_LIBAVCODEC; - -+ out_size = ret ? ret : pkt.size; -+ - if (out_size < 0) { - tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size); - return TC_EXPORT_ERROR; -Index: transcode-1.1.7/import/decode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/import/decode_lavc.c -+++ transcode-1.1.7/import/decode_lavc.c -@@ -327,8 +327,8 @@ void decode_lavc(decode_t *decode) - - // Convert avcodec image to the requested YUV or RGB format - switch (lavc_dec_context->pix_fmt) { -- case PIX_FMT_YUVJ420P: -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUVJ420P: -+ case AV_PIX_FMT_YUV420P: - // Remove "dead space" at right edge of planes, if any - if (picture.linesize[0] != lavc_dec_context->width) { - int y; -@@ -352,7 +352,7 @@ void decode_lavc(decode_t *decode) - pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, - lavc_dec_context->width, lavc_dec_context->height); - break; -- case PIX_FMT_YUV411P: -+ case AV_PIX_FMT_YUV411P: - if (picture.linesize[0] != lavc_dec_context->width) { - int y; - for (y = 0; y < lavc_dec_context->height; y++) { -@@ -371,8 +371,8 @@ void decode_lavc(decode_t *decode) - pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, - lavc_dec_context->width, lavc_dec_context->height); - break; -- case PIX_FMT_YUVJ422P: -- case PIX_FMT_YUV422P: -+ case AV_PIX_FMT_YUVJ422P: -+ case AV_PIX_FMT_YUV422P: - if (picture.linesize[0] != lavc_dec_context->width) { - int y; - for (y = 0; y < lavc_dec_context->height; y++) { -@@ -391,8 +391,8 @@ void decode_lavc(decode_t *decode) - pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, - lavc_dec_context->width, lavc_dec_context->height); - break; -- case PIX_FMT_YUVJ444P: -- case PIX_FMT_YUV444P: -+ case AV_PIX_FMT_YUVJ444P: -+ case AV_PIX_FMT_YUV444P: - if (picture.linesize[0] != lavc_dec_context->width) { - int y; - for (y = 0; y < lavc_dec_context->height; y++) { -Index: transcode-1.1.7/import/import_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/import_ffmpeg.c -+++ transcode-1.1.7/import/import_ffmpeg.c -@@ -661,8 +661,8 @@ retry: - - // Convert avcodec image to our internal YUV or RGB format - switch (lavc_dec_context->pix_fmt) { -- case PIX_FMT_YUVJ420P: -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUVJ420P: -+ case AV_PIX_FMT_YUV420P: - src_fmt = IMG_YUV420P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); -@@ -693,7 +693,7 @@ retry: - } - break; - -- case PIX_FMT_YUV411P: -+ case AV_PIX_FMT_YUV411P: - src_fmt = IMG_YUV411P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); -@@ -721,8 +721,8 @@ retry: - } - break; - -- case PIX_FMT_YUVJ422P: -- case PIX_FMT_YUV422P: -+ case AV_PIX_FMT_YUVJ422P: -+ case AV_PIX_FMT_YUV422P: - src_fmt = IMG_YUV422P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); -@@ -750,8 +750,8 @@ retry: - } - break; - -- case PIX_FMT_YUVJ444P: -- case PIX_FMT_YUV444P: -+ case AV_PIX_FMT_YUVJ444P: -+ case AV_PIX_FMT_YUV444P: - src_fmt = IMG_YUV444P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch deleted file mode 100644 index 9ad765e1c3..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch +++ /dev/null @@ -1,508 +0,0 @@ -Index: transcode-1.1.7/encode/encode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/encode/encode_lavc.c -+++ transcode-1.1.7/encode/encode_lavc.c -@@ -77,6 +77,13 @@ struct tclavcconfigdata_ { - int luma_elim_threshold; - int chroma_elim_threshold; - int quantizer_noise_shaping; -+ int inter_quant_bias; -+ int intra_quant_bias; -+ int scenechange_factor; -+ int rc_strategy; -+ float rc_initial_cplx; -+ float rc_qsquish; -+ float border_masking; - - /* same as above for flags */ - struct { -@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc - switch (vob->divxmultipass) { - case 1: - CAN_DO_MULTIPASS(multipass_flag); -- pd->ff_vcontext.flags |= CODEC_FLAG_PASS1; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1; - pd->stats_file = fopen(vob->divxlogfile, "w"); - if (pd->stats_file == NULL) { - tc_log_error(MOD_NAME, "could not create 2pass log file" -@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc - break; - case 2: - CAN_DO_MULTIPASS(multipass_flag); -- pd->ff_vcontext.flags |= CODEC_FLAG_PASS2; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2; - pd->stats_file = fopen(vob->divxlogfile, "r"); - if (pd->stats_file == NULL){ - tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\"" -@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc - break; - case 3: - /* fixed qscale :p */ -- pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE; - pd->ff_venc_frame.quality = vob->divxbitrate; - break; - } -@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa - pd->confdata.rc_buffer_size = 0; - pd->confdata.lmin = 2; - pd->confdata.lmax = 31; -- pd->confdata.me_method = ME_EPZS; -+ pd->confdata.me_method = 0; - - memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags)); - pd->confdata.turbo_setup = 0; -@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.me_range = 0; - pd->ff_vcontext.mb_decision = 0; - pd->ff_vcontext.scenechange_threshold = 0; -- pd->ff_vcontext.scenechange_factor = 1; -+ pd->confdata.scenechange_factor = 1; - pd->ff_vcontext.b_frame_strategy = 0; - pd->ff_vcontext.b_sensitivity = 40; - pd->ff_vcontext.brd_scale = 0; - pd->ff_vcontext.bidir_refine = 0; -- pd->ff_vcontext.rc_strategy = 2; -+ pd->confdata.rc_strategy = 2; - pd->ff_vcontext.b_quant_factor = 1.25; - pd->ff_vcontext.i_quant_factor = 0.8; - pd->ff_vcontext.b_quant_offset = 1.25; -@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.qblur = 0.5; - pd->ff_vcontext.qcompress = 0.5; - pd->ff_vcontext.mpeg_quant = 0; -- pd->ff_vcontext.rc_initial_cplx = 0.0; -- pd->ff_vcontext.rc_qsquish = 1.0; -+ pd->confdata.rc_initial_cplx = 0.0; -+ pd->confdata.rc_qsquish = 1.0; - pd->confdata.luma_elim_threshold = 0; - pd->confdata.chroma_elim_threshold = 0; - pd->ff_vcontext.strict_std_compliance = 0; -@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.temporal_cplx_masking = 0.0; - pd->ff_vcontext.spatial_cplx_masking = 0.0; - pd->ff_vcontext.p_masking = 0.0; -- pd->ff_vcontext.border_masking = 0.0; -+ pd->confdata.border_masking = 0.0; - pd->ff_vcontext.me_pre_cmp = 0; - pd->ff_vcontext.me_cmp = 0; - pd->ff_vcontext.me_sub_cmp = 0; -@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.pre_me = 1; - pd->ff_vcontext.me_subpel_quality = 8; - pd->ff_vcontext.refs = 1; -- pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; -- pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.noise_reduction = 0; - pd->confdata.quantizer_noise_shaping = 0; - pd->ff_vcontext.flags = 0; -@@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa - */ - static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd) - { -+ char buf[1024]; - /* some translation... */ - pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000; - pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000; - pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000; - pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024; -- pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5); -- pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5); -- pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method; -+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5)); -+ av_dict_set(&(pd->ff_opts), "lmin", buf, 0); -+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5)); -+ av_dict_set(&(pd->ff_opts), "lmax", buf, 0); - - pd->ff_vcontext.flags = 0; -- SET_FLAG(pd, mv0); - SET_FLAG(pd, qpel); -- SET_FLAG(pd, naq); - SET_FLAG(pd, ilme); - SET_FLAG(pd, ildct); - SET_FLAG(pd, aic); -@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC - } - if (pd->interlacing.active) { - /* enforce interlacing */ -- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; -- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME; - } - if (pd->confdata.flags.alt) { - av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); -@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC - if (pd->confdata.flags.cbp) { - av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); - } -+ if (pd->confdata.flags.mv0) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0); -+ } -+ if (pd->confdata.flags.naq) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0); -+ } - -- char buf[1024]; - #define set_dict_opt(val, opt) \ - snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ - av_dict_set(&(pd->ff_opts), opt, buf, 0) -+#define set_dict_float_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\ -+ av_dict_set(&(pd->ff_opts), opt, buf, 0) - - set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); - set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); - set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); -+ set_dict_opt(inter_quant_bias, "pbias"); -+ set_dict_opt(intra_quant_bias, "ibias"); -+ set_dict_opt(me_method, "me_method"); -+ set_dict_opt(scenechange_factor, "sc_factor"); -+ set_dict_opt(rc_strategy, "rc_strategy"); -+ set_dict_float_opt(rc_initial_cplx, "rc_init_cplx"); -+ set_dict_float_opt(rc_qsquish, "qsquish"); -+ set_dict_float_opt(border_masking, "border_mask"); - } - - #undef SET_FLAG -@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri - { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, -- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES }, -+ { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX }, - { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, }, - { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 }, - { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 }, -- { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 }, -+ { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 }, - { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, - { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 }, - { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, -@@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri - { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 }, - { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 }, - { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 }, -- { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 }, -+ { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 }, - { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 }, - { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 }, - { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 }, -@@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri - { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 }, - // { "vrc_eq", }, // not yet supported - { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 }, -- { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, -+ { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, - // { "vrc_init_occupancy", }, // not yet supported -- { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, -+ { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, - { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri - { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, -- { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, -+ { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 }, - { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 }, - { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 }, -@@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri - { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 }, - { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 }, -- { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -- { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -+ { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -+ { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - -- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, -+ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, -+ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL }, - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, -- { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, -- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, -+ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME }, -+ { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT }, -+ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, - #else -- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, -+ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED }, - #endif - { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, -+ { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, - #else - { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #endif -- { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY }, -- { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV }, -- { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP }, -+ { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY }, -+ { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV }, -+ { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP }, - - // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported - /* End of the config file */ -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -831,14 +831,11 @@ MOD_init - - lavc_venc_context->bit_rate = vob->divxbitrate * 1000; - lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000; -- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); -- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); - lavc_venc_context->max_qdiff = lavc_param_vqdiff; - lavc_venc_context->qcompress = lavc_param_vqcompress; - lavc_venc_context->qblur = lavc_param_vqblur; - lavc_venc_context->max_b_frames = lavc_param_vmax_b_frames; - lavc_venc_context->b_quant_factor = lavc_param_vb_qfactor; -- lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; - lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; - lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; - -@@ -846,8 +843,23 @@ MOD_init - #define set_dict_opt(val, opt) \ - snprintf(buf, sizeof(buf), "%i", val); \ - av_dict_set(&lavc_venc_opts, opt, buf, 0) -+#define set_dict_float_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%f", val); \ -+ av_dict_set(&lavc_venc_opts, opt, buf, 0) - set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); - set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); -+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin"); -+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax"); -+ set_dict_opt(lavc_param_vrc_strategy, "rc_strategy"); -+ set_dict_float_opt(lavc_param_rc_qsquish, "qsquish"); -+ set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp"); -+ set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq"); -+ set_dict_opt(lavc_param_rc_eq, "rc_eq"); -+ set_dict_opt(lavc_param_vme, "me_method"); -+ set_dict_opt(lavc_param_ibias, "ibias"); -+ set_dict_opt(lavc_param_pbias, "pbias"); -+ set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity"); -+ set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx"); - lavc_venc_context->rtp_payload_size = lavc_param_packet_size; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - if (lavc_param_packet_size) -@@ -856,15 +868,9 @@ MOD_init - lavc_venc_context->strict_std_compliance= lavc_param_strict; - lavc_venc_context->i_quant_factor = lavc_param_vi_qfactor; - lavc_venc_context->i_quant_offset = lavc_param_vi_qoffset; -- lavc_venc_context->rc_qsquish = lavc_param_rc_qsquish; -- lavc_venc_context->rc_qmod_amp = lavc_param_rc_qmod_amp; -- lavc_venc_context->rc_qmod_freq = lavc_param_rc_qmod_freq; -- lavc_venc_context->rc_eq = lavc_param_rc_eq; - lavc_venc_context->rc_max_rate = lavc_param_rc_max_rate * 1000; - lavc_venc_context->rc_min_rate = lavc_param_rc_min_rate * 1000; - lavc_venc_context->rc_buffer_size = lavc_param_rc_buffer_size * 1024; -- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; -- lavc_venc_context->rc_initial_cplx = lavc_param_rc_initial_cplx; - lavc_venc_context->debug = lavc_param_debug; - lavc_venc_context->last_predictor_count= lavc_param_last_pred; - lavc_venc_context->pre_me = lavc_param_pre_me; -@@ -872,8 +878,6 @@ MOD_init - lavc_venc_context->pre_dia_size = lavc_param_pre_dia_size; - lavc_venc_context->me_subpel_quality = lavc_param_me_subpel_quality; - lavc_venc_context->me_range = lavc_param_me_range; -- lavc_venc_context->intra_quant_bias = lavc_param_ibias; -- lavc_venc_context->inter_quant_bias = lavc_param_pbias; - lavc_venc_context->coder_type = lavc_param_coder; - lavc_venc_context->context_model = lavc_param_context; - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; -@@ -1079,6 +1083,8 @@ MOD_init - lavc_venc_context->flags |= lavc_param_mv0; - if(lavc_param_qp_rd) - av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); -+ if (lavc_param_normalize_aqp) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0); - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1087,9 +1093,7 @@ MOD_init - #endif - - if (lavc_param_gray) -- lavc_venc_context->flags |= CODEC_FLAG_GRAY; -- if (lavc_param_normalize_aqp) -- lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY; - - switch(vob->encode_fields) { - case TC_ENCODE_FIELDS_TOP_FIRST: -@@ -1107,9 +1111,9 @@ MOD_init - } - - lavc_venc_context->flags |= interlacing_active ? -- CODEC_FLAG_INTERLACED_DCT : 0; -+ AV_CODEC_FLAG_INTERLACED_DCT : 0; - lavc_venc_context->flags |= interlacing_active ? -- CODEC_FLAG_INTERLACED_ME : 0; -+ AV_CODEC_FLAG_INTERLACED_ME : 0; - - lavc_venc_context->flags |= lavc_param_psnr; - do_psnr = lavc_param_psnr; -@@ -1156,7 +1160,7 @@ MOD_init - "encoding."); - return TC_EXPORT_ERROR; - } -- lavc_venc_context->flags |= CODEC_FLAG_PASS1; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1; - stats_file = fopen(vob->divxlogfile, "w"); - if (stats_file == NULL){ - tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".", -@@ -1170,7 +1174,7 @@ MOD_init - "encoding."); - return TC_EXPORT_ERROR; - } -- lavc_venc_context->flags |= CODEC_FLAG_PASS2; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2; - stats_file= fopen(vob->divxlogfile, "r"); - if (stats_file==NULL){ - tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for " -@@ -1201,12 +1205,11 @@ MOD_init - break; - case 3: - /* fixed qscale :p */ -- lavc_venc_context->flags |= CODEC_FLAG_QSCALE; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE; - lavc_venc_frame->quality = vob->divxbitrate; - break; - } - -- lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ - if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { -Index: transcode-1.1.7/export/ffmpeg_cfg.c -=================================================================== ---- transcode-1.1.7.orig/export/ffmpeg_cfg.c -+++ transcode-1.1.7/export/ffmpeg_cfg.c -@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0; - int lavc_param_pre_me= 1; - int lavc_param_me_subpel_quality= 8; - int lavc_param_me_range=0; --int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS; --int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS; -+int lavc_param_ibias=0; -+int lavc_param_pbias=0; - int lavc_param_coder=0; - int lavc_param_context=0; - char *lavc_param_intra_matrix = NULL; -@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000}, - {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9}, -- {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV}, -+ {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV}, - {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5}, - // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, - {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, - {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, -- {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES}, -+ {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX}, - // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, - {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, - {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, -@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, -+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={ - {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20}, - {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0}, - {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, -- {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR}, -+ {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR}, - {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, -@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={ - {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000}, - {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000}, -- {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL}, -+ {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL}, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT}, -+ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT}, - #else - {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1}, - #endif -@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={ - {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8}, - {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000}, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC}, -+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC}, - #else -- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, -+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED}, - #endif - {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, -@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={ - {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, -- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, -+ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, - {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, -- {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, -+ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, -- {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, -- {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED}, -- {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP}, -+ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED}, -+ {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP}, - {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, - {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, - {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, -Index: transcode-1.1.7/import/import_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/import_ffmpeg.c -+++ transcode-1.1.7/import/import_ffmpeg.c -@@ -361,7 +361,7 @@ do_avi: - lavc_dec_context->width = x_dim; - lavc_dec_context->height = y_dim; - -- if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY; -+ if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else diff --git a/multimedia/transcode/transcode-1.1.7-libav-10.patch b/multimedia/transcode/transcode-1.1.7-libav-10.patch deleted file mode 100644 index 1f4a24039d..0000000000 --- a/multimedia/transcode/transcode-1.1.7-libav-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -fix building w/libav-10 - -https://wiki.libav.org/Migration/10 - ---- a/filter/filter_resample.c -+++ b/filter/filter_resample.c -@@ -37,6 +37,7 @@ - #include "libtc/optstr.h" - #include "libtc/tcavcodec.h" - #include "libtc/tcmodule-plugin.h" -+#include - - - typedef struct { -@@ -45,7 +46,7 @@ typedef struct { - - int bytes_per_sample; - -- ReSampleContext *resample_ctx; -+ AVAudioResampleContext *resample_ctx; - } ResamplePrivateData; - - static const char resample_help[] = "" ---- a/import/probe_ffmpeg.c -+++ b/import/probe_ffmpeg.c -@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info) - info->bitrate = st->codec->bit_rate / 1000; - info->width = st->codec->width; - info->height = st->codec->height; -- if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) { -- info->fps = av_q2d(st->r_frame_rate); -+ if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) { -+ info->fps = av_q2d(st->avg_frame_rate); - } else { - /* watch out here */ - info->fps = 1.0/av_q2d(st->codec->time_base); diff --git a/multimedia/transcode/transcode-1.1.7-libav-9.patch b/multimedia/transcode/transcode-1.1.7-libav-9.patch deleted file mode 100644 index 3989d3d83a..0000000000 --- a/multimedia/transcode/transcode-1.1.7-libav-9.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200 -+++ import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200 -@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe) - return; - } - -- ret = av_find_stream_info(lavf_dmx_context); -+ ret = avformat_find_stream_info(lavf_dmx_context, NULL); - if (ret < 0) { - tc_log_error(__FILE__, "unable to fetch informations from '%s'" - " (libavformat failure)", ---- import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200 -+++ import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200 -@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode) - - // Set these to the expected values so that ffmpeg's decoder can - // properly detect interlaced input. -- lavc_dec_context = avcodec_alloc_context(); -+ lavc_dec_context = avcodec_alloc_context3(NULL); - if (lavc_dec_context == NULL) { - tc_log_error(__FILE__, "Could not allocate enough memory."); - goto decoder_error; -@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode) - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; - -- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) { -+ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) { - tc_log_error(__FILE__, "Could not initialize the '%s' codec.", - codec->name); - goto decoder_error; diff --git a/multimedia/transcode/transcode-1.1.7-preset-force.patch b/multimedia/transcode/transcode-1.1.7-preset-force.patch deleted file mode 100644 index 0d1da8b4f6..0000000000 --- a/multimedia/transcode/transcode-1.1.7-preset-force.patch +++ /dev/null @@ -1,28 +0,0 @@ -Do not force using a preset. Do not try to open non-existant preset by default. - -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -1206,7 +1206,7 @@ MOD_init - lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ -- if (lavc_param_video_preset) { -+ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { - avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; - video_codec_name = av_strdup(ffmpeg_codec_name(codec->name)); - -Index: transcode-1.1.7/export/ffmpeg_cfg.c -=================================================================== ---- transcode-1.1.7.orig/export/ffmpeg_cfg.c -+++ transcode-1.1.7/export/ffmpeg_cfg.c -@@ -124,7 +124,7 @@ int lavc_param_gmc = 0; - //int lavc_param_atag = 0; - //int lavc_param_abitrate = 224; - --char *lavc_param_video_preset = "medium"; -+char *lavc_param_video_preset = "none"; - char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; - - TCConfigEntry lavcopts_conf[]={ diff --git a/multimedia/transcode/transcode-1.1.7-preset-free.patch b/multimedia/transcode/transcode-1.1.7-preset-free.patch deleted file mode 100644 index 00494b94ba..0000000000 --- a/multimedia/transcode/transcode-1.1.7-preset-free.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix invalid free when preset file not found -https://bugs.gentoo.org/show_bug.cgi?id=322945 -Author: Brennan Shacklett - -diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c ---- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 20:07:05.669083945 -0700 -@@ -321,7 +321,7 @@ - } - - if(!f){ -- fprintf(stderr, "File for preset '%s' not found\n", arg); -+ tc_log_error(MOD_NAME, "File for preset '%s' not found", arg); - av_exit(1); - } - -@@ -1207,7 +1207,7 @@ - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ - if (lavc_param_video_preset) { - avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; -- video_codec_name = ffmpeg_codec_name(codec->name); -+ video_codec_name = av_strdup(ffmpeg_codec_name(codec->name)); - - const char *preset_start = lavc_param_video_preset; - while (preset_start) { -@@ -1225,6 +1225,8 @@ - if (opt_preset("vpre", preset_name) != 0) { - tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name); - } -+ av_free(video_codec_name); -+ video_codec_name = NULL; - if (verbose) { - int i; - tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count); diff --git a/multimedia/transcode/transcode.SlackBuild b/multimedia/transcode/transcode.SlackBuild index d9a7341eb2..f84883fbc1 100644 --- a/multimedia/transcode/transcode.SlackBuild +++ b/multimedia/transcode/transcode.SlackBuild @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -79,19 +76,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix building with newer ffmpeg -patch -p0 -i $CWD/transcode-1.1.7-ffmpeg.patch -patch -p0 -i $CWD/transcode-1.1.7-ffmpeg-0.10.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg-0.11.patch -patch -p1 -i $CWD/transcode-1.1.7-preset-free.patch -patch -p0 -i $CWD/transcode-1.1.7-libav-9.patch -patch -p1 -i $CWD/transcode-1.1.7-libav-10.patch -patch -p1 -i $CWD/transcode-1.1.7-preset-force.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg2.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg24.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg29.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg4.patch # Fix building with imagemagick 7.x +# 2024: this is actually not true anymore and imagemagick support had to be disabled, sorry folks patch -p1 -i $CWD/transcode-1.1.7-imagemagick7.patch patch -p1 -i $CWD/transcode-1.1.7-gcc10.patch patch -p1 -i $CWD/transcode-1.1.7-glibc-2.32.patch @@ -100,7 +86,8 @@ autoreconf -vif export MAGICKCORE_QUANTUM_DEPTH=32 -CFLAGS="$SLKCFLAGS" \ +# unfortunately ffmpeg >= 5.x breaks compatibility and no patches are available... +CFLAGS="$SLKCFLAGS -fpermissive -std=gnu17" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -109,6 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --mandir=/usr/man \ + --disable-ffmpeg \ --enable-alsa \ --enable-v4l \ --enable-libv4lconvert \ @@ -131,7 +119,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-nuv \ --enable-lzo \ --enable-libpostproc \ - --enable-imagemagick \ --build=$ARCH-slackware-linux make diff --git a/multimedia/tvheadend/tvheadend.SlackBuild b/multimedia/tvheadend/tvheadend.SlackBuild index fd60f65751..23df71bf9d 100644 --- a/multimedia/tvheadend/tvheadend.SlackBuild +++ b/multimedia/tvheadend/tvheadend.SlackBuild @@ -108,6 +108,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-libtheora_static \ --disable-libvorbis_static \ --disable-libfdkaac_static \ + --disable-libav \ --python=python3 \ --disable-pcloud_cache \ --nowerror \ diff --git a/multimedia/vcdimager/libxml214.diff b/multimedia/vcdimager/libxml214.diff new file mode 100644 index 0000000000..4dc5e0024b --- /dev/null +++ b/multimedia/vcdimager/libxml214.diff @@ -0,0 +1,37 @@ +diff -Nurp vcdimager-2.0.1/frontends/xml/vcd_xml_common.c vcdimager-2.0.1-libxml214/frontends/xml/vcd_xml_common.c +--- vcdimager-2.0.1/frontends/xml/vcd_xml_common.c 2018-01-03 21:17:37.000000000 +0100 ++++ vcdimager-2.0.1-libxml214/frontends/xml/vcd_xml_common.c 2025-04-26 05:22:03.008769534 +0200 +@@ -242,17 +242,27 @@ _convert (const char in[], const char en + + temp = size - 1; + if (from) { +- if (NULL != handler->output) +- ret = handler->output (out, &out_size, (const unsigned char *) in, &temp); +- else ++ if (!(handler->flags & 2) && NULL != handler->output.func) ++ ret = handler->output.func (handler->outputCtxt, out, &out_size, (const unsigned char *) in, &temp, 1); ++ if ((handler->flags & 2) && NULL != handler->output.legacyFunc) ++ ret = handler->output.legacyFunc (out, &out_size, (const unsigned char *) in, &temp); ++ else { ++ xmlCharEncCloseFunc(handler); + return strdup(in); ++ } + } else { +- if (NULL != handler->input) +- ret = handler->input (out, &out_size, (const unsigned char *) in, &temp); +- else ++ if (!(handler->flags & 2) && NULL != handler->input.func) ++ ret = handler->input.func (handler->inputCtxt, out, &out_size, (const unsigned char *) in, &temp, 1); ++ if ((handler->flags & 2) && NULL != handler->input.legacyFunc) ++ ret = handler->input.legacyFunc (out, &out_size, (const unsigned char *) in, &temp); ++ else { ++ xmlCharEncCloseFunc(handler); + return strdup(in); ++ } + } + ++ xmlCharEncCloseFunc(handler); ++ + if (ret < 0 || (temp - size + 1)) + { + free (out); diff --git a/multimedia/vcdimager/vcdimager.SlackBuild b/multimedia/vcdimager/vcdimager.SlackBuild index 6e3c8c3e7b..614d5c8492 100644 --- a/multimedia/vcdimager/vcdimager.SlackBuild +++ b/multimedia/vcdimager/vcdimager.SlackBuild @@ -82,6 +82,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/libxml214.diff + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/vlc/4645.patch b/multimedia/vlc/4645.patch new file mode 100644 index 0000000000..bd26976fbc --- /dev/null +++ b/multimedia/vlc/4645.patch @@ -0,0 +1,177 @@ +From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001 +From: Thomas Guillem +Date: Tue, 5 Dec 2023 09:23:35 +0100 +Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment + +Fixes #28441 +--- + src/input/input_internal.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/input/input_internal.h b/src/input/input_internal.h +index d29731edca1b..ea02f39f5add 100644 +--- a/src/input/input_internal.h ++++ b/src/input/input_internal.h +@@ -117,7 +117,7 @@ typedef struct input_thread_private_t + + /* Title infos FIXME multi-input (not easy) ? */ + int i_title; +- const input_title_t **title; ++ input_title_t * const *title; + + int i_title_offset; + int i_seekpoint_offset; +-- +GitLab + + +From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001 +From: Zhao Zhili +Date: Thu, 1 Mar 2018 14:25:59 +0800 +Subject: [PATCH 2/5] yadif: fix variable type + +Signed-off-by: Thomas Guillem +(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60) +Signed-off-by: Thomas Guillem +--- + modules/video_filter/deinterlace/yadif.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h +index 4bc592ba9307..af16443d0804 100644 +--- a/modules/video_filter/deinterlace/yadif.h ++++ b/modules/video_filter/deinterlace/yadif.h +@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8 + } + + static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) { +- uint8_t *dst = (uint8_t *)dst8; +- uint8_t *prev = (uint8_t *)prev8; +- uint8_t *cur = (uint8_t *)cur8; +- uint8_t *next = (uint8_t *)next8; ++ uint16_t *dst = (uint16_t *)dst8; ++ uint16_t *prev = (uint16_t *)prev8; ++ uint16_t *cur = (uint16_t *)cur8; ++ uint16_t *next = (uint16_t *)next8; + int x; + uint16_t *prev2= parity ? prev : cur ; + uint16_t *next2= parity ? cur : next; +-- +GitLab + + +From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 3 Mar 2019 09:59:10 +0200 +Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion + +(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058) +Signed-off-by: Thomas Guillem +--- + modules/video_chroma/swscale.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c +index 8993d11ec5dd..11897527355c 100644 +--- a/modules/video_chroma/swscale.c ++++ b/modules/video_chroma/swscale.c +@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, + { + filter_sys_t *p_sys = p_filter->p_sys; + uint8_t palette[AVPALETTE_SIZE]; +- uint8_t *src[4]; int src_stride[4]; +- uint8_t *dst[4]; int dst_stride[4]; ++ uint8_t *src[4], *dst[4]; ++ const uint8_t *csrc[4]; ++ int src_stride[4], dst_stride[4]; + + GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video, + p_src, i_plane_count, b_swap_uvi ); +@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, + GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video, + p_dst, i_plane_count, b_swap_uvo ); + ++ for (size_t i = 0; i < ARRAY_SIZE(src); i++) ++ csrc[i] = src[i]; ++ + #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) +- sws_scale( ctx, src, src_stride, 0, i_height, ++ sws_scale( ctx, csrc, src_stride, 0, i_height, + dst, dst_stride ); + #else +- sws_scale_ordered( ctx, src, src_stride, 0, i_height, ++ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height, + dst, dst_stride ); + #endif + } +-- +GitLab + + +From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 3 Mar 2019 17:20:04 +0200 +Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing + +(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35) +Signed-off-by: Thomas Guillem +--- + modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +index a93462925e8a..a85f9aafb0b9 100644 +--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c ++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] = + void RegisterCommand( filter_t *p_filter ) + { + filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; +- size_t i_index = 0; + + p_sys->i_commands = ARRAY_SIZE(p_commands); + p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) ); + if( !p_sys->pp_commands ) return; +- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ ) ++ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ ) + { + p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) ); + if( !p_sys->pp_commands[i_index] ) return; +-- +GitLab + + +From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Mon, 26 Feb 2018 20:43:03 +0200 +Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption + +Font alpha is 8-bits, not 32-bits. + +(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0) +Signed-off-by: Thomas Guillem +--- + modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +index a85f9aafb0b9..7a71c6f2373a 100644 +--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c ++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end, + skip_space( &psz_command ); + if( isdigit( (unsigned char)*psz_command ) ) + { +- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC ) ++ int32_t value; ++ ++ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC ) + return VLC_EGENERIC; ++ ++ p_params->fontstyle.i_font_alpha = value; + } + return VLC_SUCCESS; + } +-- +GitLab + diff --git a/multimedia/vlc/4665.patch b/multimedia/vlc/4665.patch new file mode 100644 index 0000000000..47e5847d05 --- /dev/null +++ b/multimedia/vlc/4665.patch @@ -0,0 +1,375 @@ +From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Mon, 26 Feb 2018 20:36:29 +0200 +Subject: [PATCH 1/9] chromaprint: missing cast + +(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547) +Signed-off-by: Steve Lhomme +--- + modules/stream_out/chromaprint.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c +index 80ec31ba2590..c76cbda3c2bb 100644 +--- a/modules/stream_out/chromaprint.c ++++ b/modules/stream_out/chromaprint.c +@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, + if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer ) + { + if(! chromaprint_feed( p_sys->p_chromaprint_ctx, +- p_buf->p_buffer, ++ (int16_t *)p_buf->p_buffer, + p_buf->i_buffer / BYTESPERSAMPLE ) ) + msg_Warn( p_stream, "feed error" ); + id->i_samples -= i_samples; +-- +GitLab + + +From 6179d6b843f2a93af6a3d51c4244766e3eba9e77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 14 Apr 2019 09:41:38 +0300 +Subject: [PATCH 2/9] win32: wrap {g,s}etsockopt() + +char * can alias anything, and Winsock relies on that. Unfortunately, +the compiler still issues warnings. This works around that. + +(cherry picked from commit 36715d9b79f34824e126c2bc3aee2f1c1c16af46) +Signed-off-by: Steve Lhomme +--- + include/vlc_network.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/include/vlc_network.h b/include/vlc_network.h +index 010454a01c09..e39ffd0bacaa 100644 +--- a/include/vlc_network.h ++++ b/include/vlc_network.h +@@ -183,6 +183,22 @@ VLC_API int vlc_close(int); + + /** @} */ + ++#ifdef _WIN32 ++static inline int vlc_getsockopt(int s, int level, int name, ++ void *val, socklen_t *len) ++{ ++ return getsockopt(s, level, name, (char *)val, len); ++} ++#define getsockopt vlc_getsockopt ++ ++static inline int vlc_setsockopt(int s, int level, int name, ++ const void *val, socklen_t len) ++{ ++ return setsockopt(s, level, name, (const char *)val, len); ++} ++#define setsockopt vlc_setsockopt ++#endif ++ + /* Portable network names/addresses resolution layer */ + + #define NI_MAXNUMERICHOST 64 +-- +GitLab + + +From 3391108f9709f0d77d9297c94371cf9cd30f2cbe Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 7 Dec 2023 15:43:04 +0100 +Subject: [PATCH 3/9] netsync: use char for temporary local buffer + +On Windows recvfrom/revc/sendto expects a char*. +--- + modules/control/netsync.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/modules/control/netsync.c b/modules/control/netsync.c +index 2a6a1a6a2bf8..8c91034d7cf2 100644 +--- a/modules/control/netsync.c ++++ b/modules/control/netsync.c +@@ -181,7 +181,7 @@ static void *Master(void *handle) + intf_sys_t *sys = intf->p_sys; + for (;;) { + struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; +- uint64_t data[2]; ++ char data[16]; + + if (poll(&ufd, 1, -1) < 0) + continue; +@@ -198,8 +198,8 @@ static void *Master(void *handle) + if (master_system < 0) + continue; + +- data[0] = hton64(mdate()); +- data[1] = hton64(master_system); ++ SetQWBE(&data[0], mdate()); ++ SetQWBE(&data[8], master_system); + + /* Reply to the sender */ + sendto(sys->fd, data, 16, 0, +@@ -224,7 +224,7 @@ static void *Slave(void *handle) + + for (;;) { + struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; +- uint64_t data[2]; ++ char data[16]; + + vlc_tick_t system = GetPcrSystem(sys->input); + if (system < 0) +@@ -233,7 +233,7 @@ static void *Slave(void *handle) + /* Send clock request to the master */ + const vlc_tick_t send_date = mdate(); + +- data[0] = hton64(system); ++ SetQWBE(&data[0], system); + send(sys->fd, data, 8, 0); + + /* Don't block */ +@@ -244,8 +244,8 @@ static void *Slave(void *handle) + if (recv(sys->fd, data, 16, 0) < 16) + goto wait; + +- const vlc_tick_t master_date = ntoh64(data[0]); +- const vlc_tick_t master_system = ntoh64(data[1]); ++ const vlc_tick_t master_date = GetQWBE(&data[0]); ++ const vlc_tick_t master_system = GetQWBE(&data[8]); + const vlc_tick_t diff_date = receive_date - + ((receive_date - send_date) / 2 + master_date); + +-- +GitLab + + +From 27e584d7b9add8dbbb82b7227228e1ec1e25a089 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Tue, 3 Jan 2023 13:23:00 +0100 +Subject: [PATCH 4/9] access/dtv: move the lfind() Windows hack in the module + +So that we don't have to include search.h each time vlc_fixups.h is used. + +The Win32 prototype of lfind() expects an unsigned* for 'nelp', not a size_t*. + +(cherry picked from commit 7c43bcba27b6fe256456d93a9d32e10648f08da8) +Signed-off-by: Steve Lhomme +--- + include/vlc_fixups.h | 3 +++ + modules/access/dtv/access.c | 5 +++++ + 2 files changed, 8 insertions(+) + +diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h +index 37f788933779..861cb4cc5063 100644 +--- a/include/vlc_fixups.h ++++ b/include/vlc_fixups.h +@@ -501,8 +501,11 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void + void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) ); + void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); + void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) ); ++#ifndef _WIN32 ++/* the Win32 prototype of lfind() expects an unsigned* for 'nmemb' */ + void *lfind( const void *key, const void *base, size_t *nmemb, + size_t size, int(*cmp)(const void *, const void *) ); ++#endif + #endif /* HAVE_SEARCH_H */ + #ifndef HAVE_TDESTROY + void tdestroy( void *root, void (*free_node)(void *nodep) ); +diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c +index d9756c7b4885..c6ca5005883c 100644 +--- a/modules/access/dtv/access.c ++++ b/modules/access/dtv/access.c +@@ -32,6 +32,11 @@ + #ifdef HAVE_SEARCH_H + #include + #endif ++#if defined(_WIN32) ++/* the Win32 prototype of lfind() expects an unsigned* for 'nelp' */ ++# define lfind(a,b,c,d,e) \ ++ lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e)) ++#endif + + #include "dtv/dtv.h" + +-- +GitLab + + +From 5a9ca37a95b6e85e6beaaefba9aa4a886a45411c Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Mon, 15 Jul 2019 12:41:29 +0200 +Subject: [PATCH 5/9] vlc_common: fix swab() calls on win32 that don't use + const on source pointer + +(cherry picked from commit a9e0b1124e19225b903a2926951781e84002c410) +Signed-off-by: Steve Lhomme +--- + include/vlc_common.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/include/vlc_common.h b/include/vlc_common.h +index 8090b277150d..089878581763 100644 +--- a/include/vlc_common.h ++++ b/include/vlc_common.h +@@ -947,6 +947,11 @@ static inline void SetQWLE (void *p, uint64_t qw) + # define O_NONBLOCK 0 + # endif + ++/* the mingw32 swab() and win32 _swab() prototypes expect a char* instead of a ++ const void* */ ++# define swab(a,b,c) swab((char*) (a), (char*) (b), (c)) ++ ++ + # include + #endif /* _WIN32 */ + +-- +GitLab + + +From b758e19479a80604e3feb470b197e4a13a203a85 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 10 Jul 2019 08:23:45 +0200 +Subject: [PATCH 6/9] avcodec: encoder: fix MPEG4 matrix passed as const + +lavc expects a pointer that it will free in avcodec_free_context(). + +(cherry picked from commit d86c4c87aa78130a4fd00294e25df865d0e2b327) +Signed-off-by: Steve Lhomme +--- + modules/codec/avcodec/encoder.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c +index 2b1c3604713d..4919ccf0e0e4 100644 +--- a/modules/codec/avcodec/encoder.c ++++ b/modules/codec/avcodec/encoder.c +@@ -588,8 +588,14 @@ int InitVideoEnc( vlc_object_t *p_this ) + + if ( p_sys->b_mpeg4_matrix ) + { +- p_context->intra_matrix = mpeg4_default_intra_matrix; +- p_context->inter_matrix = mpeg4_default_non_intra_matrix; ++ p_context->intra_matrix = av_malloc( sizeof(mpeg4_default_intra_matrix) ); ++ if ( p_context->intra_matrix ) ++ memcpy( p_context->intra_matrix, mpeg4_default_intra_matrix, ++ sizeof(mpeg4_default_intra_matrix)); ++ p_context->inter_matrix = av_malloc( sizeof(mpeg4_default_non_intra_matrix) ); ++ if ( p_context->inter_matrix ) ++ memcpy( p_context->inter_matrix, mpeg4_default_non_intra_matrix, ++ sizeof(mpeg4_default_non_intra_matrix)); + } + + if ( p_sys->b_pre_me ) +-- +GitLab + + +From 55be3ce60795a09d13861c5637c1fe7aebc5ce8b Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 7 Dec 2023 14:18:22 +0100 +Subject: [PATCH 7/9] smb: fix potential string to wide string copy + +The type of net_resource depends on the UNICODE define. +--- + modules/access/smb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/access/smb.c b/modules/access/smb.c +index 5fe56f0c9dfe..6add2a3e6278 100644 +--- a/modules/access/smb.c ++++ b/modules/access/smb.c +@@ -524,7 +524,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, + const char *psz_pwd, const char *psz_domain ) + { + char psz_remote[MAX_PATH]; +- NETRESOURCE net_resource; ++ NETRESOURCEA net_resource; + DWORD i_result; + VLC_UNUSED( psz_domain ); + +@@ -544,7 +544,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, + + net_resource.lpRemoteName = psz_remote; + +- i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 ); ++ i_result = WNetAddConnection2A( &net_resource, psz_pwd, psz_user, 0 ); + + if( i_result != NO_ERROR ) + { +-- +GitLab + + +From 5ae924bf212dce64a6424561d92426dbcc2cf3a0 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 6 Dec 2023 14:45:46 +0100 +Subject: [PATCH 8/9] dxva2: add missing mask initializers + +--- + modules/codec/avcodec/dxva2.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c +index 18b872fe0fe3..2e6809a05410 100644 +--- a/modules/codec/avcodec/dxva2.c ++++ b/modules/codec/avcodec/dxva2.c +@@ -84,12 +84,12 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, + + /* XXX Preferred format must come first */ + static const d3d9_format_t d3d_formats[] = { +- { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12 }, +- { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12 }, +- //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12 }, +- { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010 }, ++ { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12, 0,0,0 }, ++ { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12, 0,0,0 }, ++ //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12, 0,0,0 }, ++ { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010, 0,0,0 }, + +- { NULL, 0, 0 } ++ { NULL, 0, 0, 0,0,0 } + }; + + static const d3d9_format_t *D3dFindFormat(D3DFORMAT format) +-- +GitLab + + +From 08c7a66780740679ba1b0abe9e30e73afc6bc271 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 6 Dec 2023 07:48:29 +0100 +Subject: [PATCH 9/9] win32/modules: use cast with GetProcAddress function + pointers + +--- + src/text/url.c | 3 ++- + src/win32/plugin.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/text/url.c b/src/text/url.c +index b962eb31f849..2eb4b8d10817 100644 +--- a/src/text/url.c ++++ b/src/text/url.c +@@ -892,7 +892,8 @@ static int IdnToAscii(DWORD flags, LPCWSTR str, int len, LPWSTR buf, int size) + int (WINAPI *IdnToAsciiReal)(DWORD, LPCWSTR, int, LPWSTR, int); + int ret = 0; + +- IdnToAsciiReal = GetProcAddress(h, "IdnToAscii"); ++ IdnToAsciiReal = (int (WINAPI *)(DWORD, LPCWSTR, int, LPWSTR, int)) ++ GetProcAddress(h, "IdnToAscii"); + if (IdnToAsciiReal != NULL) + ret = IdnToAsciiReal(flags, str, len, buf, size); + else +diff --git a/src/win32/plugin.c b/src/win32/plugin.c +index 1a65521fca75..b5c336eb99ca 100644 +--- a/src/win32/plugin.c ++++ b/src/win32/plugin.c +@@ -45,7 +45,8 @@ static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode) + + BOOL (WINAPI *SetThreadErrorModeReal)(DWORD, DWORD *); + +- SetThreadErrorModeReal = GetProcAddress(h, "SetThreadErrorMode"); ++ SetThreadErrorModeReal = (BOOL (WINAPI *)(DWORD, DWORD *)) ++ GetProcAddress(h, "SetThreadErrorMode"); + if (SetThreadErrorModeReal != NULL) + return SetThreadErrorModeReal(mode, oldmode); + +-- +GitLab + diff --git a/multimedia/vlc/vlc-3.0.21-fedora_ffmpeg7-1.patch b/multimedia/vlc/vlc-3.0.21-fedora_ffmpeg7-1.patch new file mode 100644 index 0000000000..d6df9831dd --- /dev/null +++ b/multimedia/vlc/vlc-3.0.21-fedora_ffmpeg7-1.patch @@ -0,0 +1,1139 @@ +Submitted By: Bruce Dubbs +Date: 2024-05-27 +Initial Package Version: 3.0.20 +Upstream Status: Unknown +Origin: Fedora +Description: Fixes compilation with ffmpeg-7 + +From 965ad6ca875fea94712b4e8b107d0100937dcd4f Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Fri, 3 Aug 2018 10:59:16 +0200 +Subject: [PATCH] avcodec: remove libavutils checks that are always true based + on configure checks + +We assume we use 55.9.0 and 55.22.101 +--- + modules/codec/avcodec/avcommon_compat.h | 4 ---- + modules/codec/avcodec/chroma.c | 6 ------ + modules/codec/avcodec/encoder.c | 6 +----- + modules/codec/avcodec/va.c | 5 +---- + modules/codec/avcodec/video.c | 12 ++---------- + 5 files changed, 4 insertions(+), 29 deletions(-) + +diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h +index 8f9c12081cf8..afd5cc476f8f 100644 +--- a/modules/codec/avcodec/avcommon_compat.h ++++ b/modules/codec/avcodec/avcommon_compat.h +@@ -91,10 +91,6 @@ + ( (LIBAVUTIL_VERSION_MICRO < 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ + (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) ) + +-#if !LIBAVUTIL_VERSION_CHECK( 52, 11, 0, 32, 100 ) +-# define AV_PIX_FMT_FLAG_HWACCEL PIX_FMT_HWACCEL +-#endif +- + /* + * AV_PIX_FMT_VAAPI is not introduced in the same major version in libav and FFmpeg: + * - libav: lavu 55.8.0: libav/d264c720f7b74286840719e506daba39f83b438b +diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c +index cd8d714bf295..454a20381e41 100644 +--- a/modules/codec/avcodec/chroma.c ++++ b/modules/codec/avcodec/chroma.c +@@ -145,13 +145,11 @@ static const struct + VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_0BGR32, AV_PIX_FMT_0RGB32, 0x000000ff, 0x0000ff00, 0x00ff0000 ) + #endif + +-#if (LIBAVUTIL_VERSION_MICRO == 0 || LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 55, 0, 100 ) ) + #ifdef WORDS_BIGENDIAN + {VLC_CODEC_RGBA64, AV_PIX_FMT_RGBA64BE, 0, 0, 0 }, + #else /* !WORDS_BIGENDIAN */ + {VLC_CODEC_RGBA64, AV_PIX_FMT_RGBA64LE, 0, 0, 0 }, + #endif /* !WORDS_BIGENDIAN */ +-#endif + + {VLC_CODEC_RGBA, AV_PIX_FMT_RGBA, 0, 0, 0 }, + {VLC_CODEC_ARGB, AV_PIX_FMT_ARGB, 0, 0, 0 }, +@@ -180,9 +178,7 @@ static const struct + {VLC_CODEC_GBR_PLANAR_16B, AV_PIX_FMT_GBRP16BE, 0, 0, 0 }, + + /* XYZ */ +-#if LIBAVUTIL_VERSION_CHECK(52, 10, 0, 25, 100) + {VLC_CODEC_XYZ12, AV_PIX_FMT_XYZ12, 0xfff0, 0xfff0, 0xfff0}, +-#endif + { 0, 0, 0, 0, 0 } + }; + +diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c +index a00439e93965..cbe150c7016f 100644 +--- a/modules/codec/avcodec/encoder.c ++++ b/modules/codec/avcodec/encoder.c +@@ -48,9 +48,7 @@ + #include "avcodec.h" + #include "avcommon.h" + +-#if LIBAVUTIL_VERSION_CHECK( 52,2,6,0,0 ) +-# include +-#endif ++#include + + #define HURRY_UP_GUARD1 (450000) + #define HURRY_UP_GUARD2 (300000) +@@ -740,7 +738,6 @@ int InitVideoEnc( vlc_object_t *p_this ) + p_context->time_base.num = 1; + p_context->time_base.den = p_context->sample_rate; + p_context->channels = p_enc->fmt_out.audio.i_channels; +-#if LIBAVUTIL_VERSION_CHECK( 52, 2, 6, 0, 0) + p_context->channel_layout = channel_mask[p_context->channels][1]; + + /* Setup Channel ordering for multichannel audio +@@ -790,7 +787,6 @@ int InitVideoEnc( vlc_object_t *p_this ) + p_sys->i_channels_to_reorder = + aout_CheckChannelReorder( NULL, pi_order_dst, order_mask, + p_sys->pi_reorder_layout ); +-#endif + + if ( p_enc->fmt_out.i_codec == VLC_CODEC_MP4A ) + { +diff --git a/modules/codec/avcodec/va.c b/modules/codec/avcodec/va.c +index d1e3048259be..ecf4e8aa14a1 100644 +--- a/modules/codec/avcodec/va.c ++++ b/modules/codec/avcodec/va.c +@@ -58,7 +58,6 @@ vlc_fourcc_t vlc_va_GetChroma(enum Pixel + } + break; + +-#if LIBAVUTIL_VERSION_CHECK(54, 13, 1, 24, 100) + case AV_PIX_FMT_D3D11VA_VLD: + switch (swfmt) + { +@@ -68,8 +67,7 @@ vlc_fourcc_t vlc_va_GetChroma(enum Pixel + return VLC_CODEC_D3D11_OPAQUE; + } + break; +-#endif +-#if (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 4, 0)) ++ + case AV_PIX_FMT_VDPAU: + switch (swfmt) + { +@@ -86,7 +84,6 @@ vlc_fourcc_t vlc_va_GetChroma(enum Pixel + return 0; + } + break; +-#endif + default: + return 0; + } +diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c +index a9d45ba4abe1..3c2b3adb2663 100644 +--- a/modules/codec/avcodec/video.c ++++ b/modules/codec/avcodec/video.c +@@ -39,7 +39,7 @@ + #include + #include + #include +-#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 55, 16, 101 ) ) ++#if (LIBAVUTIL_VERSION_MICRO >= 100) + #include + #endif + +@@ -687,15 +687,11 @@ static int ffmpeg_OpenVa(decoder_t *p_de + static const enum PixelFormat hwfmts[] = + { + #ifdef _WIN32 +-#if LIBAVUTIL_VERSION_CHECK(54, 13, 1, 24, 100) + AV_PIX_FMT_D3D11VA_VLD, +-#endif + AV_PIX_FMT_DXVA2_VLD, + #endif + AV_PIX_FMT_VAAPI, +-#if (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 4, 0)) + AV_PIX_FMT_VDPAU, +-#endif + AV_PIX_FMT_NONE, + }; + +@@ -995,7 +991,7 @@ static int DecodeSidedata( decoder_t *p_ + decoder_sys_t *p_sys = p_dec->p_sys; + bool format_changed = false; + +-#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 55, 16, 101 ) ) ++#if (LIBAVUTIL_VERSION_MICRO >= 100) + #define FROM_AVRAT(default_factor, avrat) \ + (uint64_t)(default_factor) * (avrat).num / (avrat).den + const AVFrameSideData *metadata = +-- +GitLab + + +From 16fd46fa506424134beb53ec88be3eea1b42a221 Mon Sep 17 00:00:00 2001 +From: Ilkka Ollakka +Date: Wed, 7 Jul 2021 12:37:58 +0000 +Subject: [PATCH] avcodec: remove use of av_init_packet as it is deprecated in + new ffmpeg major version + +av_init_packet is deprecated in new major version of ffmpeg. + +Also use av_packet_free instead of unref. + +Use av_packet_clone and AVPacket * in vlc_av_packet_t. +--- + modules/codec/avcodec/subtitle.c | 4 ---- + 5 files changed, 0 insertions(+), 4 deletions(-) + + +diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c +index a92522e4ed00..4cb920a8f444 100644 +--- a/modules/codec/avcodec/subtitle.c ++++ b/modules/codec/avcodec/subtitle.c +@@ -90,11 +90,7 @@ int InitSubtitleDec(vlc_object_t *obj) + context->extradata_size = 0; + context->extradata = NULL; + +-#if LIBAVFORMAT_VERSION_MAJOR >= 59 + context->pkt_timebase=AV_TIME_BASE_Q; +-#elif LIBAVFORMAT_VERSION_MICRO >= 100 +- av_codec_set_pkt_timebase(context, AV_TIME_BASE_Q); +-#endif + + /* */ + int ret; +-- +GitLab + + +From 18e98b8a0c410be5e1e9eac55052fe0c56901759 Mon Sep 17 00:00:00 2001 +From: Marvin Scholz +Date: Tue, 30 Nov 2021 18:20:39 +0100 +Subject: [PATCH] avcommon: remove libav from version check macros + +--- + modules/codec/avcodec/avcommon_compat.h | 29 ++++++++++++------------- + modules/codec/avcodec/fourcc.c | 4 ++-- + modules/codec/avcodec/video.c | 4 ++-- + modules/demux/avformat/mux.c | 10 ++++----- + 5 files changed, 23 insertions(+), 24 deletions(-) + +diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h +index 90de502d99ce..010b570e0820 100644 +--- a/modules/codec/avcodec/avcommon_compat.h ++++ b/modules/codec/avcodec/avcommon_compat.h +@@ -30,13 +30,13 @@ + #ifdef HAVE_LIBAVCODEC_AVCODEC_H + #include + +-/* LIBAVCODEC_VERSION_CHECK checks for the right version of libav and FFmpeg ++/* LIBAVCODEC_VERSION_CHECK checks for the right version of FFmpeg + * a is the major version +- * b and c the minor and micro versions of libav +- * d and e the minor and micro versions of FFmpeg */ +-#define LIBAVCODEC_VERSION_CHECK( a, b, c, d, e ) \ +- ( (LIBAVCODEC_VERSION_MICRO < 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ +- (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) ) ++ * b is the minor version ++ * c is the micro version ++ */ ++#define LIBAVCODEC_VERSION_CHECK( a, b, c ) \ ++ (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) + + #ifndef AV_CODEC_FLAG_OUTPUT_CORRUPT + # define AV_CODEC_FLAG_OUTPUT_CORRUPT CODEC_FLAG_OUTPUT_CORRUPT +@@ -83,13 +83,13 @@ + #ifdef HAVE_LIBAVUTIL_AVUTIL_H + # include + +-/* LIBAVUTIL_VERSION_CHECK checks for the right version of libav and FFmpeg ++/* LIBAVUTIL_VERSION_CHECK checks for the right version of FFmpeg + * a is the major version +- * b and c the minor and micro versions of libav +- * d and e the minor and micro versions of FFmpeg */ +-#define LIBAVUTIL_VERSION_CHECK( a, b, c, d, e ) \ +- ( (LIBAVUTIL_VERSION_MICRO < 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ +- (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) ) ++ * b is the minor version ++ * c is the micro version ++ */ ++#define LIBAVUTIL_VERSION_CHECK( a, b, c ) \ ++ (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) + + /* + * AV_PIX_FMT_VAAPI is not introduced in the same major version in libav and FFmpeg: +@@ -115,9 +115,8 @@ + #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H + # include + +-#define LIBAVFORMAT_VERSION_CHECK( a, b, c, d, e ) \ +- ( (LIBAVFORMAT_VERSION_MICRO < 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ +- (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) ) ++#define LIBAVFORMAT_VERSION_CHECK( a, b, c ) \ ++ (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) + + #endif + +diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c +index de41991ebb51..edab2cbdca8f 100644 +--- a/modules/codec/avcodec/fourcc.c ++++ b/modules/codec/avcodec/fourcc.c +@@ -226,7 +226,7 @@ static const struct vlc_avcodec_fourcc v + { VLC_CODEC_CLLC, AV_CODEC_ID_CLLC }, + { VLC_CODEC_MSS2, AV_CODEC_ID_MSS2 }, + { VLC_CODEC_VP9, AV_CODEC_ID_VP9 }, +-#if LIBAVCODEC_VERSION_CHECK( 57, 26, 0, 83, 101 ) ++#if LIBAVCODEC_VERSION_CHECK( 57, 83, 101 ) + { VLC_CODEC_AV1, AV_CODEC_ID_AV1 }, + #endif + { VLC_CODEC_ICOD, AV_CODEC_ID_AIC }, +@@ -281,19 +281,19 @@ static const struct vlc_avcodec_fourcc v + /* ffmpeg only: AV_CODEC_ID_SNOW */ + /* ffmpeg only: AV_CODEC_ID_SMVJPEG */ + +-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 24, 102 ) ++#if LIBAVCODEC_VERSION_CHECK( 57, 24, 102 ) + { VLC_CODEC_CINEFORM, AV_CODEC_ID_CFHD }, + #endif + +-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 70, 100 ) ++#if LIBAVCODEC_VERSION_CHECK( 57, 70, 100 ) + { VLC_CODEC_PIXLET, AV_CODEC_ID_PIXLET }, + #endif + +-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 101 ) ++#if LIBAVCODEC_VERSION_CHECK( 57, 71, 101 ) + { VLC_CODEC_SPEEDHQ, AV_CODEC_ID_SPEEDHQ }, + #endif + +-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 79, 100 ) ++#if LIBAVCODEC_VERSION_CHECK( 57, 79, 100 ) + { VLC_CODEC_FMVC, AV_CODEC_ID_FMVC }, + #endif + }; +@@ -410,7 +410,7 @@ static const struct vlc_avcodec_fourcc a + /* AV_CODEC_ID_WESTWOOD_SND1 */ + { VLC_CODEC_GSM, AV_CODEC_ID_GSM }, + { VLC_CODEC_QDM2, AV_CODEC_ID_QDM2 }, +-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 100 ) ++#if LIBAVCODEC_VERSION_CHECK( 57, 71, 100 ) + { VLC_CODEC_QDMC, AV_CODEC_ID_QDMC }, + #endif + { VLC_CODEC_COOK, AV_CODEC_ID_COOK }, +@@ -478,7 +478,7 @@ static const struct vlc_avcodec_fourcc s + { VLC_CODEC_SSA, AV_CODEC_ID_SSA }, + /* AV_CODEC_ID_MOV_TEXT */ + { VLC_CODEC_BD_PG, AV_CODEC_ID_HDMV_PGS_SUBTITLE }, +-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 100 ) ++#if LIBAVCODEC_VERSION_CHECK( 57, 71, 100 ) + { VLC_CODEC_BD_TEXT, AV_CODEC_ID_HDMV_TEXT_SUBTITLE }, + #endif + { VLC_CODEC_TELETEXT, AV_CODEC_ID_DVB_TELETEXT }, +diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c +index 594c337486a9..d3ba649f272a 100644 +--- a/modules/codec/avcodec/video.c ++++ b/modules/codec/avcodec/video.c +@@ -257,12 +257,12 @@ static int lavc_GetVideoFormat(decoder_t + case AVCOL_TRC_BT2020_12: + fmt->transfer = TRANSFER_FUNC_BT2020; + break; +-#if LIBAVUTIL_VERSION_CHECK( 55, 14, 0, 31, 100) ++#if LIBAVUTIL_VERSION_CHECK( 55, 31, 100) + case AVCOL_TRC_ARIB_STD_B67: + fmt->transfer = TRANSFER_FUNC_ARIB_B67; + break; + #endif +-#if LIBAVUTIL_VERSION_CHECK( 55, 17, 0, 37, 100) ++#if LIBAVUTIL_VERSION_CHECK( 55, 37, 100) + case AVCOL_TRC_SMPTE2084: + fmt->transfer = TRANSFER_FUNC_SMPTE_ST2084; + break; +@@ -1302,7 +1302,7 @@ static picture_t *DecodeBlock( decoder_t + } + + /* Compute the PTS */ +-#if LIBAVCODEC_VERSION_CHECK(57, 24, 0, 61, 100) ++#if LIBAVCODEC_VERSION_CHECK(57, 61, 100) + # if LIBAVCODEC_VERSION_MICRO >= 100 + vlc_tick_t i_pts = frame->best_effort_timestamp; + # else +diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c +index 52fe7ef7f9eb..b9c434f0814f 100644 +--- a/modules/demux/avformat/mux.c ++++ b/modules/demux/avformat/mux.c +@@ -61,7 +61,7 @@ struct sout_mux_sys_t + bool b_write_header; + bool b_write_keyframe; + bool b_error; +-#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) ++#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 ) + bool b_header_done; + #endif + }; +@@ -76,7 +76,7 @@ static int Mux ( sout_mux_t * ); + + static int IOWrite( void *opaque, uint8_t *buf, int buf_size ); + static int64_t IOSeek( void *opaque, int64_t offset, int whence ); +-#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) ++#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 ) + static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size, + enum AVIODataMarkerType type, int64_t time); + #endif +@@ -159,7 +159,7 @@ int avformat_OpenMux( vlc_object_t *p_th + p_sys->b_write_header = true; + p_sys->b_write_keyframe = false; + p_sys->b_error = false; +-#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) ++#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 ) + p_sys->io->write_data_type = IOWriteTyped; + p_sys->b_header_done = false; + #endif +@@ -406,7 +406,7 @@ static int MuxBlock( sout_mux_t *p_mux, + return VLC_SUCCESS; + } + +-#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) ++#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 ) + int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size, + enum AVIODataMarkerType type, int64_t time) + { +@@ -523,7 +523,7 @@ static int IOWrite( void *opaque, uint8_ + + if( p_sys->b_write_header ) + p_buf->i_flags |= BLOCK_FLAG_HEADER; +-#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) ++#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 ) + if( !p_sys->b_header_done ) + p_buf->i_flags |= BLOCK_FLAG_HEADER; + #endif +-- +GitLab + + +From 8cf02acd84a1e099e15037d7c1e4dce6e8888df9 Mon Sep 17 00:00:00 2001 +From: Marvin Scholz +Date: Tue, 30 Nov 2021 18:30:28 +0100 +Subject: [PATCH] avcodec: remove LIBAVCODEC_VERSION_MICRO >= 100 checks + +This check was used to distinguish FFmpeg and libav, as libav support +is removed now, this is no longer necessary. +--- + modules/codec/avcodec/avcommon_compat.h | 2 +- + modules/codec/avcodec/directx_va.c | 4 ++-- + modules/codec/avcodec/fourcc.c | 18 +++++++----------- + modules/codec/avcodec/video.c | 11 +---------- + 4 files changed, 11 insertions(+), 24 deletions(-) + +diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h +index 010b570e0820..f56ce84b72db 100644 +--- a/modules/codec/avcodec/avcommon_compat.h ++++ b/modules/codec/avcodec/avcommon_compat.h +@@ -36,7 +36,7 @@ + * c is the micro version + */ + #define LIBAVCODEC_VERSION_CHECK( a, b, c ) \ +- (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) ++ (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c )) + + #ifndef AV_CODEC_FLAG_OUTPUT_CORRUPT + # define AV_CODEC_FLAG_OUTPUT_CORRUPT CODEC_FLAG_OUTPUT_CORRUPT +diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c +index e240fec1ac51..7d180b574a28 100644 +--- a/modules/codec/avcodec/directx_va.c ++++ b/modules/codec/avcodec/directx_va.c +@@ -274,7 +274,7 @@ static const directx_va_mode_t DXVA_MODE + + /* VPx */ + { "VP8", &DXVA_ModeVP8_VLD, 8, 0, NULL }, +-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 57, 17, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100 ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 57, 17, 100 ) + { "VP9 profile 0", &DXVA_ModeVP9_VLD_Profile0, 8, AV_CODEC_ID_VP9, PROF_VP9_MAIN }, + { "VP9 profile 2", &DXVA_ModeVP9_VLD_10bit_Profile2, 10, AV_CODEC_ID_VP9, PROF_VP9_10 }, + #else +@@ -284,7 +284,7 @@ static const directx_va_mode_t DXVA_MODE + { "VP9 profile Intel", &DXVA_ModeVP9_VLD_Intel, 8, 0, NULL }, + + /* AV1 */ +-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 58, 112, 103 ) && LIBAVCODEC_VERSION_MICRO >= 100 ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 58, 112, 103 ) + { "AV1 Main profile 8", &DXVA_ModeAV1_VLD_Profile0, 8, AV_CODEC_ID_AV1, PROF_AV1_MAIN }, + { "AV1 Main profile 10", &DXVA_ModeAV1_VLD_Profile0, 10, AV_CODEC_ID_AV1, PROF_AV1_MAIN }, + { "AV1 High profile 8", &DXVA_ModeAV1_VLD_Profile1, 8, AV_CODEC_ID_AV1, PROF_AV1_HIGH }, +diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c +index edab2cbdca8f..c14320aa1530 100644 +--- a/modules/codec/avcodec/fourcc.c ++++ b/modules/codec/avcodec/fourcc.c +@@ -182,7 +182,7 @@ static const struct vlc_avcodec_fourcc v + /* AV_CODEC_ID_V210X */ + { VLC_CODEC_TMV, AV_CODEC_ID_TMV }, + { VLC_CODEC_V210, AV_CODEC_ID_V210 }, +-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100 ++#if LIBAVCODEC_VERSION_CHECK( 54, 50, 100 ) + { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV }, + #endif + /* AV_CODEC_ID_DPX */ +diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c +index d3ba649f272a..c5385d4574d9 100644 +--- a/modules/codec/avcodec/video.c ++++ b/modules/codec/avcodec/video.c +@@ -196,10 +196,6 @@ static int lavc_GetVideoFormat(decoder_t + { + fmt->i_frame_rate = ctx->framerate.num; + fmt->i_frame_rate_base = ctx->framerate.den; +-# if LIBAVCODEC_VERSION_MICRO < 100 +- // for some reason libav don't thinkg framerate presents actually same thing as in ffmpeg +- fmt->i_frame_rate_base *= __MAX(ctx->ticks_per_frame, 1); +-# endif + } + else if (ctx->time_base.num > 0 && ctx->time_base.den > 0) + { +@@ -1303,11 +1299,7 @@ static picture_t *DecodeBlock( decoder_t + + /* Compute the PTS */ + #if LIBAVCODEC_VERSION_CHECK(57, 61, 100) +-# if LIBAVCODEC_VERSION_MICRO >= 100 + vlc_tick_t i_pts = frame->best_effort_timestamp; +-# else +- vlc_tick_t i_pts = frame->pts; +-# endif + #else + vlc_tick_t i_pts = frame->pkt_pts; + #endif +@@ -1819,8 +1811,7 @@ no_reuse: + if (!can_hwaccel) + return swfmt; + +-#if (LIBAVCODEC_VERSION_MICRO >= 100) \ +- && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 83, 101)) ++#if LIBAVCODEC_VERSION_CHECK(57, 83, 101) + if (p_context->active_thread_type) + { + msg_Warn(p_dec, "thread type %d: disabling hardware acceleration", +-- +GitLab + + +From 29747a8abb98ba53a64aa6761983891eeed2e0e4 Mon Sep 17 00:00:00 2001 +From: Ilkka Ollakka +Date: Tue, 4 Jul 2023 16:52:38 +0300 +Subject: [PATCH] avcodec: use p_enc audio channels instead of context channels + in encoder + +Allows to have less conditions in code when adding new ch_layout use +--- + modules/codec/avcodec/encoder.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c +index 48d41fe317cd..0ef334212ba4 100644 +--- a/modules/codec/avcodec/encoder.c ++++ b/modules/codec/avcodec/encoder.c +@@ -781,7 +781,7 @@ int InitVideoEnc( vlc_object_t *p_this ) + } + } + } +- if( i_channels_src != p_context->channels ) ++ if( i_channels_src != p_enc->fmt_out.audio.i_channels ) + msg_Err( p_enc, "Channel layout not understood" ); + + p_sys->i_channels_to_reorder = +@@ -887,7 +887,7 @@ int InitVideoEnc( vlc_object_t *p_this ) + if( ret ) + { + if( p_enc->fmt_in.i_cat != AUDIO_ES || +- (p_context->channels <= 2 && i_codec_id != AV_CODEC_ID_MP2 ++ (p_enc->fmt_out.audio.i_channels <= 2 && i_codec_id != AV_CODEC_ID_MP2 + && i_codec_id != AV_CODEC_ID_MP3) ) + errmsg: + { +@@ -912,7 +912,7 @@ errmsg: + goto error; + } + +- if( p_context->channels > 2 ) ++ if( p_enc->fmt_out.audio.i_channels > 2 ) + { + p_context->channels = 2; + p_context->channel_layout = channel_mask[p_context->channels][1]; +@@ -1018,7 +1018,7 @@ errmsg: + p_context->frame_size : + AV_INPUT_BUFFER_MIN_SIZE; + p_sys->i_buffer_out = av_samples_get_buffer_size(NULL, +- p_sys->p_context->channels, p_sys->i_frame_size, ++ p_enc->fmt_out.audio.i_channels, p_sys->i_frame_size, + p_sys->p_context->sample_fmt, DEFAULT_ALIGN); + p_sys->p_buffer = av_malloc( p_sys->i_buffer_out ); + if ( unlikely( p_sys->p_buffer == NULL ) ) +@@ -1268,7 +1268,7 @@ static block_t *handle_delay_buffer( enc + { + block_t *p_block = NULL; + //How much we need to copy from new packet +- const size_t leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes; ++ const size_t leftover = leftover_samples * p_enc->fmt_out.audio.i_channels * p_sys->i_sample_bytes; + + av_frame_unref( p_sys->frame ); + p_sys->frame->format = p_sys->p_context->sample_fmt; +@@ -1291,7 +1291,7 @@ static block_t *handle_delay_buffer( enc + // We need to deinterleave from p_aout_buf to p_buffer the leftover bytes + if( p_sys->b_planar ) + aout_Deinterleave( p_sys->p_interleave_buf, p_sys->p_buffer, +- p_sys->i_frame_size, p_sys->p_context->channels, p_enc->fmt_in.i_codec ); ++ p_sys->i_frame_size, p_enc->fmt_out.audio.i_channels, p_enc->fmt_in.i_codec ); + else + memcpy( p_sys->p_buffer + buffer_delay, p_aout_buf->p_buffer, leftover); + +@@ -1309,7 +1309,7 @@ static block_t *handle_delay_buffer( enc + memset( p_sys->p_buffer + (leftover+buffer_delay), 0, padding_size ); + buffer_delay += padding_size; + } +- if( avcodec_fill_audio_frame( p_sys->frame, p_sys->p_context->channels, ++ if( avcodec_fill_audio_frame( p_sys->frame, p_enc->fmt_out.audio.i_channels, + p_sys->p_context->sample_fmt, p_sys->b_planar ? p_sys->p_interleave_buf : p_sys->p_buffer, + p_sys->i_buffer_out, + DEFAULT_ALIGN) < 0 ) +@@ -1339,7 +1339,7 @@ static block_t *EncodeAudio( encoder_t * + + //i_bytes_left is amount of bytes we get + i_samples_left = p_aout_buf ? p_aout_buf->i_nb_samples : 0; +- buffer_delay = p_sys->i_samples_delay * p_sys->i_sample_bytes * p_sys->p_context->channels; ++ buffer_delay = p_sys->i_samples_delay * p_sys->i_sample_bytes * p_enc->fmt_out.audio.i_channels; + + //p_sys->i_buffer_out = p_sys->i_frame_size * chan * p_sys->i_sample_bytes + //Calculate how many bytes we would need from current buffer to fill frame +@@ -1408,12 +1408,12 @@ static block_t *EncodeAudio( encoder_t * + p_sys->frame->channels = p_sys->p_context->channels; + + const int in_bytes = p_sys->frame->nb_samples * +- p_sys->p_context->channels * p_sys->i_sample_bytes; ++ p_enc->fmt_out.audio.i_channels* p_sys->i_sample_bytes; + + if( p_sys->b_planar ) + { + aout_Deinterleave( p_sys->p_buffer, p_aout_buf->p_buffer, +- p_sys->frame->nb_samples, p_sys->p_context->channels, p_enc->fmt_in.i_codec ); ++ p_sys->frame->nb_samples, p_enc->fmt_out.audio.i_channels, p_enc->fmt_in.i_codec ); + + } + else +@@ -1421,7 +1421,7 @@ static block_t *EncodeAudio( encoder_t * + memcpy(p_sys->p_buffer, p_aout_buf->p_buffer, in_bytes); + } + +- if( avcodec_fill_audio_frame( p_sys->frame, p_sys->p_context->channels, ++ if( avcodec_fill_audio_frame( p_sys->frame, p_enc->fmt_out.audio.i_channels, + p_sys->p_context->sample_fmt, + p_sys->p_buffer, + p_sys->i_buffer_out, +@@ -1447,7 +1447,7 @@ static block_t *EncodeAudio( encoder_t * + if( p_aout_buf->i_nb_samples > 0 ) + { + memcpy( p_sys->p_buffer + buffer_delay, p_aout_buf->p_buffer, +- p_aout_buf->i_nb_samples * p_sys->i_sample_bytes * p_sys->p_context->channels); ++ p_aout_buf->i_nb_samples * p_sys->i_sample_bytes * p_enc->fmt_out.audio.i_channels); + p_sys->i_samples_delay += p_aout_buf->i_nb_samples; + } + +-- +GitLab + + +From c4302ca59dd79efd7208a45a3fcdc44388fd03a8 Mon Sep 17 00:00:00 2001 +From: Ilkka Ollakka +Date: Tue, 4 Jul 2023 16:53:43 +0300 +Subject: [PATCH] avcodec: add handling of new ch_layout in audio encoder + +conditioned to avcodec version where is it added +--- + modules/codec/avcodec/encoder.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c +index 0ef334212ba4..38a8437261dc 100644 +--- a/modules/codec/avcodec/encoder.c ++++ b/modules/codec/avcodec/encoder.c +@@ -914,8 +914,12 @@ errmsg: + + if( p_enc->fmt_out.audio.i_channels > 2 ) + { ++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) ++ av_channel_layout_default( &p_context->ch_layout, 2 ); ++#else + p_context->channels = 2; + p_context->channel_layout = channel_mask[p_context->channels][1]; ++#endif + + /* Change fmt_in in order to ask for a channels conversion */ + p_enc->fmt_in.audio.i_channels = +@@ -1273,8 +1277,12 @@ static block_t *handle_delay_buffer( enc + av_frame_unref( p_sys->frame ); + p_sys->frame->format = p_sys->p_context->sample_fmt; + p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay; ++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) ++ av_channel_layout_copy(&p_sys->frame->ch_layout, &p_sys->p_context->ch_layout); ++#else + p_sys->frame->channel_layout = p_sys->p_context->channel_layout; + p_sys->frame->channels = p_sys->p_context->channels; ++#endif + + p_sys->frame->pts = date_Get( &p_sys->buffer_date ) * p_sys->p_context->time_base.den / + CLOCK_FREQ / p_sys->p_context->time_base.num; +@@ -1404,8 +1412,12 @@ static block_t *EncodeAudio( encoder_t * + p_sys->frame->pts = date_Get( &p_sys->buffer_date ) * p_sys->p_context->time_base.den / + CLOCK_FREQ / p_sys->p_context->time_base.num; + ++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) ++ av_channel_layout_copy(&p_sys->frame->ch_layout, &p_sys->p_context->ch_layout); ++#else + p_sys->frame->channel_layout = p_sys->p_context->channel_layout; + p_sys->frame->channels = p_sys->p_context->channels; ++#endif + + const int in_bytes = p_sys->frame->nb_samples * + p_enc->fmt_out.audio.i_channels* p_sys->i_sample_bytes; +-- +GitLab + + +From b73dc8841d999c6be9de718cd2cd3aeb13279792 Mon Sep 17 00:00:00 2001 +From: Ilkka Ollakka +Date: Tue, 4 Jul 2023 16:55:28 +0300 +Subject: [PATCH] avcodec: use ch_layout for channel layout in audio encoder + +channels and channel_layout has been deprecated in FFMPEG 5.1 and will be removed eventually + +also always create the mapping, as ch_layout is always there +--- + modules/codec/avcodec/encoder.c | 46 +++++++++++++-------------------- + 1 file changed, 18 insertions(+), 28 deletions(-) + +diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c +index 38a8437261dc..f8bd2bbf939e 100644 +--- a/modules/codec/avcodec/encoder.c ++++ b/modules/codec/avcodec/encoder.c +@@ -179,6 +179,7 @@ static const uint64_t pi_channels_map[][ + { AV_CH_STEREO_RIGHT, 0 }, + }; + ++#if !LIBAVCODEC_VERSION_CHECK(59, 24, 100) + static const uint32_t channel_mask[][2] = { + {0,0}, + {AOUT_CHAN_CENTER, AV_CH_LAYOUT_MONO}, +@@ -191,6 +192,7 @@ static const uint32_t channel_mask[][2] + {AOUT_CHANS_7_1, AV_CH_LAYOUT_7POINT1}, + {AOUT_CHANS_8_1, AV_CH_LAYOUT_OCTAGONAL}, + }; ++#endif + + static const char *const ppsz_enc_options[] = { + "keyint", "bframes", "vt", "qmin", "qmax", "codec", "hq", +@@ -737,48 +739,36 @@ int InitVideoEnc( vlc_object_t *p_this ) + date_Set( &p_sys->buffer_date, AV_NOPTS_VALUE ); + p_context->time_base.num = 1; + p_context->time_base.den = p_context->sample_rate; +- p_context->channels = p_enc->fmt_out.audio.i_channels; +- p_context->channel_layout = channel_mask[p_context->channels][1]; + +- /* Setup Channel ordering for multichannel audio ++ /* Setup Channel ordering for audio + * as VLC channel order isn't same as libavcodec expects + */ + + p_sys->i_channels_to_reorder = 0; + +- /* Specified order ++ /* Create channel layout for avcodec + * Copied from audio.c + */ +- const unsigned i_order_max = 8 * sizeof(p_context->channel_layout); + uint32_t pi_order_dst[AOUT_CHAN_MAX] = { }; + uint32_t order_mask = 0; + int i_channels_src = 0; + +- if( p_context->channel_layout ) +- { +- msg_Dbg( p_enc, "Creating channel order for reordering"); +- for( unsigned i = 0; i < sizeof(pi_channels_map)/sizeof(*pi_channels_map); i++ ) +- { +- if( p_context->channel_layout & pi_channels_map[i][0] ) +- { +- msg_Dbg( p_enc, "%d %"PRIx64" mapped to %"PRIx64"", i_channels_src, pi_channels_map[i][0], pi_channels_map[i][1]); +- pi_order_dst[i_channels_src++] = pi_channels_map[i][1]; +- order_mask |= pi_channels_map[i][1]; +- } +- } +- } +- else ++ msg_Dbg( p_enc, "Creating channel order for reordering"); ++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) ++ av_channel_layout_default( &p_context->ch_layout, p_enc->fmt_out.audio.i_channels ); ++ uint64_t channel_mask = p_context->ch_layout.u.mask; ++#else ++ p_context->channels = p_enc->fmt_out.audio.i_channels; ++ p_context->channel_layout = channel_mask[p_context->channels][1]; ++ uint64_t channel_mask = p_context->channel_layout; ++#endif ++ for( unsigned i = 0; i < sizeof(pi_channels_map)/sizeof(*pi_channels_map); i++ ) + { +- msg_Dbg( p_enc, "Creating default channel order for reordering"); +- /* Create default order */ +- for( unsigned int i = 0; i < __MIN( i_order_max, (unsigned)p_sys->p_context->channels ); i++ ) ++ if( channel_mask & pi_channels_map[i][0] ) + { +- if( i < sizeof(pi_channels_map)/sizeof(*pi_channels_map) ) +- { +- msg_Dbg( p_enc, "%d channel is %"PRIx64"", i_channels_src, pi_channels_map[i][1]); +- pi_order_dst[i_channels_src++] = pi_channels_map[i][1]; +- order_mask |= pi_channels_map[i][1]; +- } ++ msg_Dbg( p_enc, "%d %"PRIx64" mapped to %"PRIx64"", i_channels_src, pi_channels_map[i][0], pi_channels_map[i][1]); ++ pi_order_dst[i_channels_src++] = pi_channels_map[i][1]; ++ order_mask |= pi_channels_map[i][1]; + } + } + if( i_channels_src != p_enc->fmt_out.audio.i_channels ) +-- +GitLab + + +From bddf5ba19111d1cc4463d9876c4bc4ba75f82d7f Mon Sep 17 00:00:00 2001 +From: Ilkka Ollakka +Date: Wed, 5 Jul 2023 12:51:34 +0300 +Subject: [PATCH] avcodec: use p_dec->fmt_out instead of context channels on + audio channel-count + +reduces the need of ifdefs when adding ch_layout support +--- + modules/codec/avcodec/audio.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c +index 0937641f21ae..5044e1556231 100644 +--- a/modules/codec/avcodec/audio.c ++++ b/modules/codec/avcodec/audio.c +@@ -484,15 +484,15 @@ static block_t * ConvertAVFrame( decoder + /* Interleave audio if required */ + if( av_sample_fmt_is_planar( ctx->sample_fmt ) ) + { +- p_block = block_Alloc(frame->linesize[0] * ctx->channels); ++ p_block = block_Alloc(frame->linesize[0] * p_dec->fmt_out.audio.i_channels ); + if ( likely(p_block) ) + { +- const void *planes[ctx->channels]; +- for (int i = 0; i < ctx->channels; i++) ++ const void *planes[p_dec->fmt_out.audio.i_channels]; ++ for (int i = 0; i < p_dec->fmt_out.audio.i_channels; i++) + planes[i] = frame->extended_data[i]; + + aout_Interleave(p_block->p_buffer, planes, frame->nb_samples, +- ctx->channels, p_dec->fmt_out.audio.i_format); ++ p_dec->fmt_out.audio.i_channels, p_dec->fmt_out.audio.i_format); + p_block->i_nb_samples = frame->nb_samples; + } + av_frame_free(&frame); +@@ -511,7 +511,7 @@ static block_t * ConvertAVFrame( decoder + { + aout_ChannelExtract( p_buffer->p_buffer, + p_dec->fmt_out.audio.i_channels, +- p_block->p_buffer, ctx->channels, ++ p_block->p_buffer, p_dec->fmt_out.audio.i_channels, + p_block->i_nb_samples, p_sys->pi_extraction, + p_dec->fmt_out.audio.i_bitspersample ); + p_buffer->i_nb_samples = p_block->i_nb_samples; +@@ -600,13 +600,13 @@ static void SetupOutputFormat( decoder_t + if( channel_layout ) + { + for( unsigned i = 0; i < i_order_max +- && i_channels_src < p_sys->p_context->channels; i++ ) ++ && i_channels_src < p_dec->fmt_out.audio.i_channels; i++ ) + { + if( channel_layout & pi_channels_map[i][0] ) + pi_order_src[i_channels_src++] = pi_channels_map[i][1]; + } + +- if( i_channels_src != p_sys->p_context->channels && b_trust ) ++ if( i_channels_src != p_dec->fmt_out.audio.i_channels && b_trust ) + msg_Err( p_dec, "Channel layout not understood" ); + + /* Detect special dual mono case */ +-- +GitLab + +From 496f0f2a659c1339d1e37330d446e9b6ce96e76b Mon Sep 17 00:00:00 2001 +From: Ilkka Ollakka +Date: Wed, 5 Jul 2023 13:33:09 +0300 +Subject: [PATCH] avcodec: audio decoder to use ch_layout + +--- + modules/codec/avcodec/audio.c | 42 ++++++++++++++++++++++++++++------- + 1 file changed, 34 insertions(+), 8 deletions(-) + +diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c +index 5044e1556231..2c85d83005c5 100644 +--- a/modules/codec/avcodec/audio.c ++++ b/modules/codec/avcodec/audio.c +@@ -139,7 +139,11 @@ static int OpenAudioCodec( decoder_t *p_ + } + + ctx->sample_rate = p_dec->fmt_in.audio.i_rate; +- ctx->channels = p_dec->fmt_in.audio.i_channels; ++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) ++ av_channel_layout_default( &ctx->ch_layout, p_dec->fmt_in.audio.i_channels ); ++#else ++ ctx->channels = p_dec->fmt_in.audio.i_channels; ++#endif + ctx->block_align = p_dec->fmt_in.audio.i_blockalign; + ctx->bit_rate = p_dec->fmt_in.i_bitrate; + ctx->bits_per_coded_sample = p_dec->fmt_in.audio.i_bitspersample; +@@ -395,12 +399,17 @@ static int DecodeBlock( decoder_t *p_dec + ret = avcodec_receive_frame( ctx, frame ); + if( ret == 0 ) + { ++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) ++ int channels = frame->ch_layout.nb_channels; ++#else ++ int channels = ctx->channels; ++#endif + /* checks and init from first decoded frame */ +- if( ctx->channels <= 0 || ctx->channels > INPUT_CHAN_MAX ++ if( channels <= 0 || channels > INPUT_CHAN_MAX + || ctx->sample_rate <= 0 ) + { + msg_Warn( p_dec, "invalid audio properties channels count %d, sample rate %d", +- ctx->channels, ctx->sample_rate ); ++ channels, ctx->sample_rate ); + goto drop; + } + else if( p_dec->fmt_out.audio.i_rate != (unsigned int)ctx->sample_rate ) +@@ -580,6 +589,16 @@ static void SetupOutputFormat( decoder_t + p_dec->fmt_out.audio.i_rate = p_sys->p_context->sample_rate; + + /* */ ++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) ++ if( p_sys->i_previous_channels == p_sys->p_context->ch_layout.nb_channels && ++ p_sys->i_previous_layout == p_sys->p_context->ch_layout.u.mask ) ++ return; ++ if( b_trust ) ++ { ++ p_sys->i_previous_channels = p_sys->p_context->ch_layout.nb_channels; ++ p_sys->i_previous_layout = p_sys->p_context->ch_layout.u.mask; ++ } ++#else + if( p_sys->i_previous_channels == p_sys->p_context->channels && + p_sys->i_previous_layout == p_sys->p_context->channel_layout ) + return; +@@ -588,25 +607,32 @@ static void SetupOutputFormat( decoder_t + p_sys->i_previous_channels = p_sys->p_context->channels; + p_sys->i_previous_layout = p_sys->p_context->channel_layout; + } ++#endif + +- const unsigned i_order_max = sizeof(pi_channels_map)/sizeof(*pi_channels_map); +- uint32_t pi_order_src[i_order_max]; ++ uint32_t pi_order_src[AOUT_CHAN_MAX] = { 0 }; + + int i_channels_src = 0; +- int64_t channel_layout = ++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) ++ uint64_t channel_layout_mask = p_sys->p_context->ch_layout.u.mask; ++ int channel_count = p_sys->p_context->ch_layout.nb_channels; ++#else ++ uint64_t channel_layout_mask = + p_sys->p_context->channel_layout ? p_sys->p_context->channel_layout : + av_get_default_channel_layout( p_sys->p_context->channels ); ++ (uint64_t)av_get_default_channel_layout( p_sys->p_context->channels ); ++ int channel_count = p_sys->p_context->channels; ++#endif + +- if( channel_layout ) ++ if( channel_layout_mask ) + { +- for( unsigned i = 0; i < i_order_max +- && i_channels_src < p_dec->fmt_out.audio.i_channels; i++ ) ++ for( unsigned i = 0; pi_channels_map[i][0] ++ && i_channels_src < channel_count; i++ ) + { +- if( channel_layout & pi_channels_map[i][0] ) ++ if( channel_layout_mask & pi_channels_map[i][0] ) + pi_order_src[i_channels_src++] = pi_channels_map[i][1]; + } + +- if( i_channels_src != p_dec->fmt_out.audio.i_channels && b_trust ) ++ if( i_channels_src != channel_count && b_trust ) + msg_Err( p_dec, "Channel layout not understood" ); + + /* Detect special dual mono case */ +@@ -638,7 +664,7 @@ static void SetupOutputFormat( decoder_t + { + msg_Warn( p_dec, "no channel layout found"); + p_dec->fmt_out.audio.i_physical_channels = 0; +- p_dec->fmt_out.audio.i_channels = p_sys->p_context->channels; ++ p_dec->fmt_out.audio.i_channels = channel_count; + } + + aout_FormatPrepare( &p_dec->fmt_out.audio ); +-- +GitLab + +From 0ff86bf8a28a080340f600cb8561815fc43e3b4a Mon Sep 17 00:00:00 2001 +From: Ilkka Ollakka +Date: Wed, 5 Jul 2023 15:09:57 +0300 +Subject: [PATCH] avcodec/audio: make channel mapping array 0 terminated + +Also change pi_channels_src to be only AOUT_CHAN_MAX instead of same +size as mapping array. +--- + modules/codec/avcodec/audio.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c +index 2c85d83005c5..d0c8bae750b2 100644 +--- a/modules/codec/avcodec/audio.c ++++ b/modules/codec/avcodec/audio.c +@@ -577,6 +577,7 @@ static const uint64_t pi_channels_map[][ + { AV_CH_TOP_BACK_RIGHT, 0 }, + { AV_CH_STEREO_LEFT, 0 }, + { AV_CH_STEREO_RIGHT, 0 }, ++ { 0, 0 }, + }; + + static void SetupOutputFormat( decoder_t *p_dec, bool b_trust ) +-- +GitLab + + +From 1a57633d1820eb218771489505876fa55f8a8847 Mon Sep 17 00:00:00 2001 +From: Francois Cartegnie +Date: Tue, 23 Apr 2024 13:13:30 +0700 +Subject: [PATCH 1/4] codec: avcodec: map AYUV as RAWVIDEO with ffmpeg 6.0 + +--- + modules/codec/avcodec/fourcc.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c +index de7b9e1377bd..4ce2584bd303 100644 +--- a/modules/codec/avcodec/fourcc.c ++++ b/modules/codec/avcodec/fourcc.c +@@ -182,7 +182,9 @@ static const struct vlc_avcodec_fourcc v + /* AV_CODEC_ID_V210X */ + { VLC_CODEC_TMV, AV_CODEC_ID_TMV }, + { VLC_CODEC_V210, AV_CODEC_ID_V210 }, +-#if LIBAVCODEC_VERSION_CHECK( 54, 50, 100 ) ++#if LIBAVCODEC_VERSION_CHECK( 59, 42, 102 ) ++ { VLC_CODEC_VUYA, AV_CODEC_ID_RAWVIDEO }, ++#else + { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV }, + #endif + /* AV_CODEC_ID_DPX */ +-- +GitLab + + +From 3ecdd252b42dca492c79470535703eae0dfc1093 Mon Sep 17 00:00:00 2001 +From: Francois Cartegnie +Date: Tue, 23 Apr 2024 13:14:53 +0700 +Subject: [PATCH 2/4] demux/mux: avformat: use ch_layout from ffmpeg 5.1 + +--- + modules/demux/avformat/demux.c | 4 ++++ + modules/demux/avformat/mux.c | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c +index 743e0534901c..87f5b41c0d82 100644 +--- a/modules/demux/avformat/demux.c ++++ b/modules/demux/avformat/demux.c +@@ -401,7 +401,11 @@ int avformat_OpenDemux( vlc_object_t *p_ + es_format_Init( &es_fmt, AUDIO_ES, fcc ); + es_fmt.i_original_fourcc = CodecTagToFourcc( cp->codec_tag ); + es_fmt.i_bitrate = cp->bit_rate; ++#if LIBAVUTIL_VERSION_CHECK( 57, 28, 100 ) ++ es_fmt.audio.i_channels = cp->ch_layout.nb_channels; ++#else + es_fmt.audio.i_channels = cp->channels; ++#endif + es_fmt.audio.i_rate = cp->sample_rate; + es_fmt.audio.i_bitspersample = cp->bits_per_coded_sample; + es_fmt.audio.i_blockalign = cp->block_align; +diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c +index 55fc891437c7..0e87942aa76a 100644 +--- a/modules/demux/avformat/mux.c ++++ b/modules/demux/avformat/mux.c +@@ -267,7 +267,11 @@ static int AddStream( sout_mux_t *p_mux, + { + case AUDIO_ES: + codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ++#if LIBAVUTIL_VERSION_CHECK( 57, 28, 100 ) ++ av_channel_layout_default( &codecpar->ch_layout, fmt->audio.i_channels ); ++#else + codecpar->channels = fmt->audio.i_channels; ++#endif + codecpar->sample_rate = fmt->audio.i_rate; + stream->time_base = (AVRational){1, codecpar->sample_rate}; + if (fmt->i_bitrate == 0) { +-- +GitLab + + +From 1c15a5e183df7e292afd27795548d3c2254a9bbd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Mon, 6 May 2024 12:15:40 +0200 +Subject: [PATCH] demux/mux: avformat: Constify the buffer pointees + +in the write_packet from ffmpeg 6.1 + +The deprecated FF_API_AVIO_WRITE_NONCONST was removed in ffmpeg 7.0. + +Ref: +https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/2a68d945cd74265bb71c3d38b7a2e7f7d7e87be5 +https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/02aea61d69d8f81bc285e2131bf25f96a3e27feb +--- + modules/demux/avformat/mux.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c +index 0e87942aa76a..390aa3cb4dfd 100644 +--- a/modules/demux/avformat/mux.c ++++ b/modules/demux/avformat/mux.c +@@ -75,9 +75,16 @@ static int AddStream( sout_mux_t *, sout_input_t * ); + static void DelStream( sout_mux_t *, sout_input_t * ); + static int Mux ( sout_mux_t * ); + ++#if LIBAVFORMAT_VERSION_CHECK( 61, 01, 100 ) ++static int IOWrite( void *opaque, const uint8_t *buf, int buf_size ); ++#else + static int IOWrite( void *opaque, uint8_t *buf, int buf_size ); ++#endif + static int64_t IOSeek( void *opaque, int64_t offset, int whence ); +-#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 ) ++#if LIBAVFORMAT_VERSION_CHECK( 61, 01, 100 ) ++static int IOWriteTyped(void *opaque, const uint8_t *buf, int buf_size, ++ enum AVIODataMarkerType type, int64_t time); ++#elif LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 ) + static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size, + enum AVIODataMarkerType type, int64_t time); + #endif +@@ -436,8 +443,13 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) + } + + #if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 ) ++#if LIBAVFORMAT_VERSION_CHECK( 61, 01, 100 ) ++int IOWriteTyped(void *opaque, const uint8_t *buf, int buf_size, ++ enum AVIODataMarkerType type, int64_t time) ++#else + int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size, + enum AVIODataMarkerType type, int64_t time) ++#endif + { + VLC_UNUSED(time); + +@@ -533,7 +545,11 @@ static int Control( sout_mux_t *p_mux, int i_query, va_list args ) + /***************************************************************************** + * I/O wrappers for libavformat + *****************************************************************************/ ++#if LIBAVFORMAT_VERSION_CHECK( 61, 01, 100 ) ++static int IOWrite( void *opaque, const uint8_t *buf, int buf_size ) ++#else + static int IOWrite( void *opaque, uint8_t *buf, int buf_size ) ++#endif + { + sout_mux_t *p_mux = opaque; + sout_mux_sys_t *p_sys = p_mux->p_sys; +-- +GitLab diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild index 7f79e3fd32..3f30eb609b 100644 --- a/multimedia/vlc/vlc.SlackBuild +++ b/multimedia/vlc/vlc.SlackBuild @@ -91,6 +91,8 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION +patch -p1 < $CWD/vlc-3.0.21-fedora_ffmpeg7-1.patch + sed -i '/DEPRECATED/s:^://:' modules/text_renderer/freetype/text_layout.c patch -p1 < $CWD/dvdread.patch @@ -119,6 +121,9 @@ 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/4645.patch +patch -p1 < $CWD/4665.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ @@ -138,6 +143,7 @@ LDFLAGS="$SLKLDFLAGS" \ $runasroot \ $aom \ $lua +sed -i -e '/^#define _FORTIFY_SOURCE/d' config.h make make DESTDIR=$PKG install diff --git a/multimedia/x265/cmake4.patch b/multimedia/x265/cmake4.patch new file mode 100644 index 0000000000..b4dd083b8b --- /dev/null +++ b/multimedia/x265/cmake4.patch @@ -0,0 +1,32 @@ +From b354c009a60bcd6d7fc04014e200a1ee9c45c167 Mon Sep 17 00:00:00 2001 +From: yaswanthsastry +Date: Mon, 24 Feb 2025 17:07:03 +0530 +Subject: [PATCH] Fix CMake build error with latest CMake 4.0 release + +--- + source/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 37dbe1a87..4f5b3ed82 100755 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -7,13 +7,13 @@ if(NOT CMAKE_BUILD_TYPE) + endif() + message(STATUS "cmake version ${CMAKE_VERSION}") + if(POLICY CMP0025) +- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang ++ cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang + endif() + if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH + endif() + if(POLICY CMP0054) +- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted ++ cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted + endif() + + project (x265) +-- +2.48.1 + diff --git a/multimedia/x265/x265.SlackBuild b/multimedia/x265/x265.SlackBuild index 6304c6793e..c1696d5acf 100644 --- a/multimedia/x265/x265.SlackBuild +++ b/multimedia/x265/x265.SlackBuild @@ -76,6 +76,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/cmake4.patch + for d in 8 $([ "$ARCH" = "x86_64" ] && echo "10 12"); do if [[ -d build-$d ]]; then rm -rf build-$d @@ -97,6 +99,7 @@ if [ "$ARCH" = "x86_64" ]; then -DEXPORT_C_API=OFF \ -DENABLE_CLI=OFF \ -DENABLE_SHARED=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release ../source make @@ -111,6 +114,7 @@ if [ "$ARCH" = "x86_64" ]; then -DEXPORT_C_API=OFF \ -DENABLE_CLI=OFF \ -DENABLE_SHARED=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release ../source make @@ -129,6 +133,7 @@ if [ "$ARCH" = "x86_64" ]; then -DEXTRA_LINK_FLAGS="-L." \ -DLINKED_10BIT=ON \ -DLINKED_12BIT=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release ../source make @@ -142,6 +147,7 @@ else -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \ -DENABLE_SHARED=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release ../source make diff --git a/multimedia/xvidcore/xvidcore-c23.patch b/multimedia/xvidcore/xvidcore-c23.patch new file mode 100644 index 0000000000..ebdb3058d1 --- /dev/null +++ b/multimedia/xvidcore/xvidcore-c23.patch @@ -0,0 +1,13 @@ +diff -up xvidcore/src/encoder.h.c23 xvidcore/src/encoder.h +--- xvidcore/src/encoder.h.c23 2019-12-28 15:19:24.000000000 +0100 ++++ xvidcore/src/encoder.h 2025-01-29 12:22:35.863665766 +0100 +@@ -42,7 +42,9 @@ + * Types + ****************************************************************************/ + ++#if __STDC_VERSION__ < 202311L + typedef int bool; ++#endif + + /***************************************************************************** + * Structures diff --git a/multimedia/xvidcore/xvidcore.SlackBuild b/multimedia/xvidcore/xvidcore.SlackBuild index c056df029c..3be595ca24 100644 --- a/multimedia/xvidcore/xvidcore.SlackBuild +++ b/multimedia/xvidcore/xvidcore.SlackBuild @@ -80,6 +80,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/xvidcore-c23.patch + cd build/generic CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/ClusterSSH/ClusterSSH.SlackBuild b/network/ClusterSSH/ClusterSSH.SlackBuild index d206a9ad70..267e349b8e 100644 --- a/network/ClusterSSH/ClusterSSH.SlackBuild +++ b/network/ClusterSSH/ClusterSSH.SlackBuild @@ -25,7 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ClusterSSH -VERSION=${VERSION:-4.09} +SRCNAM=$(echo $PRGNAM | tr [A-Z] [a-z]) +VERSION=${VERSION:-4.18} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -69,9 +67,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf App-$PRGNAM-$VERSION -tar xvf $CWD/App-$PRGNAM-$VERSION.tar.gz -cd App-$PRGNAM-$VERSION +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 \ @@ -89,8 +87,11 @@ perl Build.PL \ --install_path bindoc=/usr/man/man1 \ --install_path libdoc=/usr/man/man3 +mkdir -p $PKG/usr/share/bash-completion/completions +mv $PKG/usr/bin/clusterssh_bash_completion.dist $PKG/usr/share/bash-completion/completions/cssh +chmod 644 $PKG/usr/share/bash-completion/completions/cssh # Avoid being Perl version dependent -sed -i -r -e "s,^(#!/usr/bin/perl).*$,\1," $PKG/usr/bin/* +sed -i -r -e "s,^(#!/usr/bin/perl).*$,\1," $PKG/usr/bin/* || exit 1 chmod 755 $PKG/usr/bin/* find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/network/ClusterSSH/ClusterSSH.info b/network/ClusterSSH/ClusterSSH.info index 25fc65f056..a4d4b2b148 100644 --- a/network/ClusterSSH/ClusterSSH.info +++ b/network/ClusterSSH/ClusterSSH.info @@ -1,8 +1,8 @@ PRGNAM="ClusterSSH" -VERSION="4.09" +VERSION="4.18" HOMEPAGE="https://github.com/duncs/clusterssh/wiki" -DOWNLOAD="http://downloads.sourceforge.net/clusterssh/App-ClusterSSH-4.09.tar.gz" -MD5SUM="557e8440b246f4122c2decf6cc61730a" +DOWNLOAD="https://github.com/duncs/clusterssh/archive/v4.18/clusterssh-4.18.tar.gz" +MD5SUM="c2fbf0ed5c7cf8169b605ce52691fa9c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-Try-Tiny perl-File-Which perl-Test-Pod perl-Test-Pod-Coverage perl-CPAN-Changes \ diff --git a/network/MEGAcmd/MEGAcmd.SlackBuild b/network/MEGAcmd/MEGAcmd.SlackBuild index bda6fb6a14..1a66ac7809 100644 --- a/network/MEGAcmd/MEGAcmd.SlackBuild +++ b/network/MEGAcmd/MEGAcmd.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=MEGAcmd VERSION=${VERSION:-1.7.0} SDK=${SDK:-4.31.0b} -FFMPEG4_PATCHREV=${FFMPEG4_PATCHREV:-1.7.0} +FFMPEG6_PATCHREV=${FFMPEG6_PATCHREV:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -78,8 +78,8 @@ cd $PRGNAM-${VERSION}_Linux/sdk tar --strip-components=1 -xvf $CWD/sdk-$SDK.tar.gz cd ../ -# Apply patch for FFmpeg4 -patch -p1 < $CWD/megacmd-${FFMPEG4_PATCHREV}_ffmpeg4.patch +# Apply patch for FFmpeg6 +patch -p1 < $CWD/megacmd-${FFMPEG6_PATCHREV}_ffmpeg6.patch chown -R root:root . find -L . \ diff --git a/network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch b/network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch deleted file mode 100644 index 78caff0b98..0000000000 --- a/network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sdk/src/gfx/freeimage.cpp 2024-05-23 06:07:49.544014882 +0900 -+++ b/sdk/src/gfx/freeimage.cpp 2024-05-23 06:12:29.575018194 +0900 -@@ -212,7 +212,7 @@ - #ifdef AV_CODEC_CAP_TRUNCATED - #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED - #else --#define CAP_TRUNCATED CODEC_CAP_TRUNCATED -+#define CAP_TRUNCATED 0 - #endif - - const char *GfxProviderFreeImage::supportedformatsFfmpeg() diff --git a/network/MEGAcmd/megacmd-1.7.0_ffmpeg6.patch b/network/MEGAcmd/megacmd-1.7.0_ffmpeg6.patch new file mode 100644 index 0000000000..54295ec85b --- /dev/null +++ b/network/MEGAcmd/megacmd-1.7.0_ffmpeg6.patch @@ -0,0 +1,27 @@ +diff -Naur MEGAcmd-1.7.0_Linux.orig/sdk/src/gfx/freeimage.cpp MEGAcmd-1.7.0_Linux/sdk/src/gfx/freeimage.cpp +--- MEGAcmd-1.7.0_Linux.orig/sdk/src/gfx/freeimage.cpp 2024-05-17 16:19:43.000000000 +0200 ++++ MEGAcmd-1.7.0_Linux/sdk/src/gfx/freeimage.cpp 2024-05-25 09:19:52.452609376 +0200 +@@ -209,12 +209,6 @@ + + #ifdef HAVE_FFMPEG + +-#ifdef AV_CODEC_CAP_TRUNCATED +-#define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED +-#else +-#define CAP_TRUNCATED CODEC_CAP_TRUNCATED +-#endif +- + const char *GfxProviderFreeImage::supportedformatsFfmpeg() + { + return ".264.265.3g2.3gp.3gpa.3gpp.3gpp2.mp3" +@@ -330,10 +324,6 @@ + + // Force seeking to key frames + formatContext->seek2any = false; +- if (decoder->capabilities & CAP_TRUNCATED) +- { +- codecContext->flags |= CAP_TRUNCATED; +- } + + AVPixelFormat sourcePixelFormat = static_cast(codecParm->format); + AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format diff --git a/network/MEGAsync/MEGAsync.SlackBuild b/network/MEGAsync/MEGAsync.SlackBuild index 4d804db29e..f16c80962e 100644 --- a/network/MEGAsync/MEGAsync.SlackBuild +++ b/network/MEGAsync/MEGAsync.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=MEGAsync -VERSION=${VERSION:-4.5.3.0} -SDK=${SDK:-3.8.2c} +VERSION=${VERSION:-4.9.1.0} +SDK=${SDK:-4.16.0c} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,7 +83,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/megasync-4.5.0.0_ffmpeg.patch +patch -p1 < $CWD/megasync-4.9.1.0_ffmpeg6.patch cd src/MEGASync/mega patch -p1 < $CWD/megasync-4.5.0.0_pdfium.patch diff --git a/network/MEGAsync/MEGAsync.info b/network/MEGAsync/MEGAsync.info index db02860be9..c01bb2800b 100644 --- a/network/MEGAsync/MEGAsync.info +++ b/network/MEGAsync/MEGAsync.info @@ -1,10 +1,10 @@ PRGNAM="MEGAsync" -VERSION="4.5.3.0" +VERSION="4.9.1.0" HOMEPAGE="https://github.com/meganz/MEGAsync/" -DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.5.3.0_Linux/MEGAsync-4.5.3.0_Linux.tar.gz \ - https://github.com/meganz/sdk/archive/v3.8.2c/sdk-3.8.2c.tar.gz" -MD5SUM="be0f1e070b6990c19d766990758ef997 \ - ded79c86d1ddbe2572f0562fa1dc15fc" +DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.9.1.0_Linux/MEGAsync-4.9.1.0_Linux.tar.gz \ + https://github.com/meganz/sdk/archive/v4.16.0c/sdk-4.16.0c.tar.gz" +MD5SUM="be9fca6eee9bad9de2f8999bec51ccbb \ + b8c50f486602b2a8af4866d098cae303" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="FreeImage libmediainfo" diff --git a/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch b/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch deleted file mode 100644 index a30d4a1eff..0000000000 --- a/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur a/src/MEGASync/mega/src/gfx/freeimage.cpp b/src/MEGASync/mega/src/gfx/freeimage.cpp ---- a/src/MEGASync/mega/src/gfx/freeimage.cpp 2021-05-23 02:28:08.694081111 +0100 -+++ b/src/MEGASync/mega/src/gfx/freeimage.cpp 2021-05-23 02:29:56.189964969 +0100 -@@ -188,7 +188,7 @@ - - // Force seeking to key frames - formatContext->seek2any = false; -- videoStream->skip_to_keyframe = true; -+ //videoStream->skip_to_keyframe = true; - if (decoder->capabilities & CAP_TRUNCATED) - { - codecContext.flags |= CAP_TRUNCATED; -diff -Naur a/src/MEGASync/mega/src/gfx/qt.cpp b/src/MEGASync/mega/src/gfx/qt.cpp ---- a/src/MEGASync/mega/src/gfx/qt.cpp 2021-05-23 02:28:08.694081111 +0100 -+++ b/src/MEGASync/mega/src/gfx/qt.cpp 2021-05-23 02:29:36.172545153 +0100 -@@ -1209,7 +1209,7 @@ - - // Force seeking to key frames - formatContext->seek2any = false; -- videoStream->skip_to_keyframe = true; -+ //videoStream->skip_to_keyframe = true; - if (decoder->capabilities & CAP_TRUNCATED) - { - codecContext.flags |= CAP_TRUNCATED; diff --git a/network/MEGAsync/megasync-4.9.1.0_ffmpeg6.patch b/network/MEGAsync/megasync-4.9.1.0_ffmpeg6.patch new file mode 100644 index 0000000000..f42c30d922 --- /dev/null +++ b/network/MEGAsync/megasync-4.9.1.0_ffmpeg6.patch @@ -0,0 +1,40 @@ +--- a/src/MEGASync/mega/src/gfx/freeimage.cpp 2024-02-05 12:31:08.907475460 +0900 ++++ b/src/MEGASync/mega/src/gfx/freeimage.cpp 2024-02-05 13:38:52.356174823 +0900 +@@ -209,11 +209,13 @@ + + #ifdef HAVE_FFMPEG + ++#if LIBAVCODEC_VERSION_MAJOR < 60 + #ifdef AV_CODEC_CAP_TRUNCATED + #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED + #else + #define CAP_TRUNCATED CODEC_CAP_TRUNCATED + #endif ++#endif + + const char *GfxProviderFreeImage::supportedformatsFfmpeg() + { +@@ -313,7 +315,7 @@ + + // Find decoder for video stream + AVCodecID codecId = codecParm->codec_id; +- AVCodec* decoder = avcodec_find_decoder(codecId); ++ auto decoder = avcodec_find_decoder(codecId); + if (!decoder) + { + LOG_warn << "Codec not found: " << codecId; +@@ -330,11 +332,13 @@ + + // Force seeking to key frames + formatContext->seek2any = false; +- videoStream->skip_to_keyframe = true; ++ //videoStream->skip_to_keyframe = true; ++ #if LIBAVCODEC_VERSION_MAJOR < 60 + if (decoder->capabilities & CAP_TRUNCATED) + { + codecContext->flags |= CAP_TRUNCATED; + } ++ #endif + + AVPixelFormat sourcePixelFormat = static_cast(codecParm->format); + AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format diff --git a/network/aMule/aMule.SlackBuild b/network/aMule/aMule.SlackBuild index b910674f18..b123f44053 100644 --- a/network/aMule/aMule.SlackBuild +++ b/network/aMule/aMule.SlackBuild @@ -7,7 +7,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=aMule -VERSION=${VERSION:-2.3.3} +VERSION=${VERSION:-20250117_4a1b78a} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -139,8 +139,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +./autogen.sh + CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=gnu++14" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/aMule/aMule.info b/network/aMule/aMule.info index a1ffa7d06d..9cccf3fe26 100644 --- a/network/aMule/aMule.info +++ b/network/aMule/aMule.info @@ -1,10 +1,10 @@ PRGNAM="aMule" -VERSION="2.3.3" +VERSION="20250117_4a1b78a" HOMEPAGE="http://www.amule.org" -DOWNLOAD="https://downloads.sf.net/amule/aMule-2.3.3.tar.xz" -MD5SUM="2858a7f693c76c23f1786364d6a80900" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/aMule-20250117_4a1b78a.tar.xz" +MD5SUM="ebf831f3b18ba262a05b2af8015881f9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="wxGTK3" +REQUIRES="wxWidgets" MAINTAINER="Ozan Türkyılmaz" EMAIL="ozan.turkyilmaz@gmail.com" diff --git a/network/avahi/README b/network/avahi/README deleted file mode 100644 index 3057f78a16..0000000000 --- a/network/avahi/README +++ /dev/null @@ -1,14 +0,0 @@ -Avahi is an implementation of the DNS Service Discovery and Multicast -DNS specifications for Zeroconf Computing. It uses D-BUS for -communication between user applications and a system daemon. The -daemon is used to coordinate application efforts in caching replies, -necessary to minimize the traffic imposed on networks. This kind -of technology is already found in Apple MacOS X (branded Rendezvous -Bonjour and sometimes Zeroconf) and is very convenient. - -You will need to have an "avahi" user and group on the target -system prior to installing the avahi package. See README.SBo in this -directory (it is also installed to the package docmentation directory) -for more information and for setup notes. - -mono support is not working ATM so it's forcibly disabled. diff --git a/network/avahi/README.SBo b/network/avahi/README.SBo deleted file mode 100644 index d05e6bb6b9..0000000000 --- a/network/avahi/README.SBo +++ /dev/null @@ -1,43 +0,0 @@ -README.SBo (avahi) - -First, be sure you have an "avahi" user and group. Do this *before* -you install the avahi package. We recommend uid/gid of 214, but -adjust as needed for your system. Something like this should suffice: - - # groupadd -g 214 avahi - # useradd -u 214 -g 214 -c "Avahi User" -d /dev/null -s /bin/false avahi - - -Now start the Avahi daemon: - - # /etc/rc.d/rc.avahidaemon start - -Optionally start the unicast DNS configuration daemon: - - # /etc/rc.d/rc.avahidnsconfd start - - -You will need to start avahi at boot by adding the following -to your /etc/rc.d/rc.local and make them executable: - - # Start avahidaemon - if [ -x /etc/rc.d/rc.avahidaemon ]; then - /etc/rc.d/rc.avahidaemon start - fi - # Start avahidnsconfd - if [ -x /etc/rc.d/rc.avahidnsconfd ]; then - /etc/rc.d/rc.avahidnsconfd start - fi - -You will also want to put the following into /etc/rc.d/rc.local_shutdown -(if that file does not exist, create it and make it executable): - - # Stop avahidnsconfd - if [ -x /etc/rc.d/rc.avahidnsconfd ]; then - /etc/rc.d/rc.avahidnsconfd stop - fi - # Stop avahidaemon - if [ -x /etc/rc.d/rc.avahidaemon ]; then - /etc/rc.d/rc.avahidaemon stop - fi - diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild deleted file mode 100644 index 8ef58a1590..0000000000 --- a/network/avahi/avahi.SlackBuild +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/bash - -# Slackware build script for avahi - -# Copyright 2008-2012 David Somero (dsomero@hotmail.com) Athens, TN, USA -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20220301 bkw: Modified by SlackBuilds.org, BUILD=7: -# - don't include empty /run dir in package. -# - remove useless INSTALL from doc dir. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=avahi -VERSION=${VERSION:-20240306_709e60f} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -warn_accounts() { - echo " You must have an avahi user and group to run this script. " - echo " Something like this should suffice for most systems: " - echo " # groupadd -g 214 avahi" - echo " # useradd -u 214 -g 214 -c "Avahi" -d /dev/null -s /bin/false avahi" - exit 1 -} - -# Bail if user and/or group isn't valid on your system -if ! getent passwd avahi &>/dev/null; then - warn_accounts -fi -if ! getent group avahi &>/dev/null; then - warn_accounts -fi - -if [ "${ARCH}" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.lz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -# This patch is mine --rworkman -patch -p1 --verbose < $CWD/patches/fixup_avahi-dnsconfd.action.patch - -NOCONFIGURE=1 ./autogen.sh - -export PYTHON=python3 -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-systemdsystemunitdir=no \ - --enable-tests \ - --disable-static \ - --disable-mono \ - --disable-monodoc \ - --disable-autoipd \ - --disable-libsystemd \ - --enable-compat-libdns_sd \ - --enable-python-dbus \ - --enable-glib \ - --enable-dbus \ - --enable-python \ - --enable-gtk \ - --enable-gtk3 \ - --enable-qt5 \ - --disable-qt4 \ - --disable-qt3 \ - --enable-core-docs \ - --disable-manpages \ - --with-dbus-sys=/usr/share/dbus-1/system.d \ - --with-avahi-user=avahi \ - --with-avahi-group=avahi \ - --with-avahi-priv-access-group=netdev \ - --with-distro=slackware \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -# 20220414 bkw: if this dir is empty, it doesn't need to be included -# in the package. -rmdir $PKG/run &> /dev/null || true - -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -mkdir -p $PKG/usr/man/man1 $PKG/usr/man/man5 $PKG/usr/man/man8 -for i in $CWD/man/man1/* ; do cat $i > $PKG/usr/man/man1/$(basename $i) ; done -for i in $CWD/man/man5/* ; do cat $i > $PKG/usr/man/man5/$(basename $i) ; done -for i in $CWD/man/man8/* ; do cat $i > $PKG/usr/man/man8/$(basename $i) ; done -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new -mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new -mv $PKG/etc/avahi/avahi-daemon.conf $PKG/etc/avahi/avahi-daemon.conf.new - -# Fix python3 shebangs: -sed -i "s|#!python3|#!/usr/bin/python3|g" $PKG/usr/bin/avahi-{discover,bookmarks} - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -rm -f docs/INSTALL -cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/doc/$PRGNAM-$VERSION/README $PKG/usr/doc/$PRGNAM-$VERSION/README.too -cp -a LICENSE* README* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info deleted file mode 100644 index 22888a7b75..0000000000 --- a/network/avahi/avahi.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="avahi" -VERSION="20240306_709e60f" -HOMEPAGE="http://avahi.org/" -DOWNLOAD="https://mirrors.slackware.com/slackware/slackware64-current/source/l/avahi/avahi-20240306_709e60f.tar.lz" -MD5SUM="4f289929948f63b4f92f5c3913ea13ee" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libdaemon" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/network/avahi/doinst.sh b/network/avahi/doinst.sh deleted file mode 100644 index 9bf5bd8772..0000000000 --- a/network/avahi/doinst.sh +++ /dev/null @@ -1,38 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -preserve_perms() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ -e $OLD ]; then - cp -a $OLD ${NEW}.incoming - cat $NEW > ${NEW}.incoming - mv ${NEW}.incoming $NEW - fi - config $NEW -} - - -preserve_perms etc/rc.d/rc.avahidaemon.new -preserve_perms etc/rc.d/rc.avahidnsconfd.new -preserve_perms etc/avahi/avahi-daemon.conf.new - -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -# Reload messagebus service -if [ -x etc/rc.d/rc.messagebus ]; then - chroot . /etc/rc.d/rc.messagebus reload -fi - diff --git a/network/avahi/man/man1/avahi-bookmarks.1 b/network/avahi/man/man1/avahi-bookmarks.1 deleted file mode 100644 index 80b89f1c1b..0000000000 --- a/network/avahi/man/man1/avahi-bookmarks.1 +++ /dev/null @@ -1,33 +0,0 @@ -.TH avahi-bookmarks 1 User Manuals -.SH NAME -avahi-bookmarks \- Web service showing mDNS/DNS-SD announced HTTP services using the Avahi daemon -.SH SYNOPSIS -\fBavahi-bookmarks -\f1 -.SH DESCRIPTION -A web service for listing HTTP services that are announced via mDNS/DNS-SD using the Avahi daemon. avahi-bookmarks opens a TCP socket on port 8080 and waits for incoming HTTP connections returning a dynamic web site containing links to all services of type _http._tcp on the LAN. Point your browser to http://localhost:8080/ to make use of avahi-bookmarks. -.SH OPTIONS -.TP -\fB-p | --port=\f1 \fIPORT\f1 -Specify a TCP port number to listen on. If omitted defaults to 8080. -.TP -\fB-a | --address=\f1 \fIaddress\f1 -Specify an IP address to listen on. If omitted defaults to 127.0.0.1. Specify 0.0.0.0 if you want to allow remote access. -.TP -\fB-H | --host-names\f1 -Create links pointing to mDNS host names instead of resolved IP addresses. This is only compatible with your browser if you run some kind of local NSS module to resolve mDNS host names (e.g. nss-mdns). If both -A and -H are omitted avahi-bookmarks detects whether NSS support is available locally. This option conflicts with -A. -.TP -\fB-A | --addresses\f1 -Create links pointing to numeric IP addresses instead of mDNS host names. This will break access to hosts running virtual servers. If both -A and -H are omitted avahi-bookmarks detects whether NSS support is available locally. This option conflicts with -H. -.TP -\fB-d | --domain\f1=\fIDOMAIN\f1 -The domain to browse for services in. -.TP -\fB-h | --help\f1 -Show help -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-browse(1)\f1, \fBavahi-daemon(8)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man1/avahi-browse.1 b/network/avahi/man/man1/avahi-browse.1 deleted file mode 100644 index 11d17cb880..0000000000 --- a/network/avahi/man/man1/avahi-browse.1 +++ /dev/null @@ -1,66 +0,0 @@ -.TH avahi-browse 1 User Manuals -.SH NAME -avahi-browse \- Browse for mDNS/DNS-SD services using the Avahi daemon -.SH SYNOPSIS -\fBavahi-browse [\fIoptions\fB] \fIservice-type\fB - -avahi-browse [\fIoptions\fB] --all\fB - -avahi-browse [\fIoptions\fB] --browse-domains\fB - -avahi-browse [\fIoptions\fB] --dump-db\fB - -avahi-browse-domains [\fIoptions\fB] -\f1 -.SH DESCRIPTION -Browse for mDNS/DNS-SD network services and browsing domains using the Avahi daemon. -.SH OPTIONS -Specify a DNS-SD service type (e.g. _http._tcp) to browse for on the command line, or \fB-a\f1 to browse for all available service types. Items that appear on the network are prefixed with "+", items that disappear are prefixed with "-". If \fB--resolve\f1 is passed items that are resolved are prefixed with "=". -.TP -\fB-a | --all\f1 -Browse for all service types registered on the LAN, not just the one specified on the command line. -.TP -\fB-D | --browse-domains\f1 -Browse for browsing domains instead for services. avahi-browse-domains is equivalent to avahi-browse --browse-domains -.TP -\fB-d | --domain=\f1 \fIDOMAIN\f1 -Browse in the specified domain. If omitted avahi-browse will browse in the default browsing domain (usually: local) -.TP -\fB-v | --verbose\f1 -Enable verbose mode. -.TP -\fB-t | --terminate\f1 -Terminate after dumping a more or less complete list. -.TP -\fB-c | --cache\f1 -Terminate after dumping all entries available in the cache. -.TP -\fB-l | --ignore-local\f1 -Ignore local services, show only remote services. -.TP -\fB-r | --resolve\f1 -Automatically resolve services found. -.TP -\fB-f | --no-fail\f1 -Don't fail if the daemon is not found running. Instead, wait until it appears. If it disconnects, try to reconnect. -.TP -\fB-p | --parsable\f1 -Make output easily parsable for usage in scripts. If enabled fields are separated by semicolons (;), service names are escaped. It is recommended to combine this with \fB--no-db-lookup\f1. -.TP -\fB-k | --no-db-lookup\f1 -Don't lookup services types in service type database. -.TP -\fB-b | --dump-db\f1 -Dump the service type database (may be combined with -k) -.TP -\fB-h | --help\f1 -Show help. -.TP -\fB-V | --version\f1 -Show version information. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-publish(1)\f1, \fBavahi-resolve(1)\f1, \fBavahi-daemon(8)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man1/avahi-discover.1 b/network/avahi/man/man1/avahi-discover.1 deleted file mode 100644 index 085ff1354e..0000000000 --- a/network/avahi/man/man1/avahi-discover.1 +++ /dev/null @@ -1,16 +0,0 @@ -.TH avahi-discover 1 User Manuals -.SH NAME -avahi-discover \- Browse for mDNS/DNS-SD services using the Avahi daemon -.SH SYNOPSIS -\fBavahi-discover -\f1 -.SH DESCRIPTION -Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon. -.SH OPTIONS -avahi-discover takes no command line arguments at the moment. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-daemon(8)\f1, \fBavahi-browse(1)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man1/avahi-publish.1 b/network/avahi/man/man1/avahi-publish.1 deleted file mode 100644 index c6bd857d4b..0000000000 --- a/network/avahi/man/man1/avahi-publish.1 +++ /dev/null @@ -1,52 +0,0 @@ -.TH avahi-publish-service 1 User Manuals -.SH NAME -avahi-publish-service \- Register an mDNS/DNS-SD service or host name or address mapping using the Avahi daemon -.SH SYNOPSIS -\fBavahi-publish -s [\fIoptions\fB] \fIname\fB \fIservice-type\fB \fIport\fB [\fITXT data\fB ...] - -avahi-publish-service [\fIoptions\fB] \fIname\fB \fIservice-type\fB \fIport\fB [\fITXT data\fB ...] - -avahi-publish -a [\fIoptions\fB] \fIhost name\fB \fIaddress\fB - -avahi-publish-address [\fIoptions\fB] \fIhost name\fB \fIaddress\fB -\f1 -.SH DESCRIPTION -Register an mDNS/DNS-SD service or host name/address mapping using the Avahi daemon. -.SH OPTIONS -When calling in service registration mode, specify a DNS-SD service name (e.g. "Lennart's Files"), a service type (e.g. _http._tcp) and an IP port number for the service, optionally followed by any number of TXT record strings on the command line. When calling in address/host name registration mode specify a fully qualified host name and an address (IPv4 or IPv6). -.TP -\fB-s | --service\f1 -Register a service. avahi-publish-service is equivalent to avahi-publish -s. -.TP -\fB-a | --address\f1 -Register an address/host name mapping. avahi-publish-address is equivalent to avahi-publish -a. -.TP -\fB-v | --verbose\f1 -Enable verbose mode. -.TP -\fB-H | --host=\f1 \fIHOSTNAME\f1 -Specify a host name for this service, in case it doesn't reside on the local host. This host name needs to be fully qualified and resolvable using mDNS or unicast DNS. -.TP -\fB-d | --domain=\f1 \fIDOMAIN\f1 -Publish the service in the specified domain. If omitted the Avahi daemon will publish it in its default domain (usually .local). -.TP -\fB--subtype=\f1 \fISUBTYPE\f1 -Register the service with an additional subtype in addition to the main type. DNS-SD subtypes have the form _anon._sub._ftp._tcp, where _anon is the identifier of the subtype and _ftp._tcp is the main type. You may pass this option multiple times to register the service with multiple subtypes. -.TP -\fB-R | --no-reverse\f1 -Do not publish reverse entry with address. -.TP -\fB-f | --no-fail\f1 -Don't fail if the daemon is not found running. Instead, wait until it appears. If it disconnects, try to reconnect. -.TP -\fB-h | --help\f1 -Show help -.TP -\fB-V | --version\f1 -Show version information. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-resolve(1)\f1, \fBavahi-browse(1)\f1, \fBavahi-daemon(8)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man1/avahi-resolve.1 b/network/avahi/man/man1/avahi-resolve.1 deleted file mode 100644 index 8f5e737790..0000000000 --- a/network/avahi/man/man1/avahi-resolve.1 +++ /dev/null @@ -1,49 +0,0 @@ -.TH avahi-resolve 1 User Manuals -.SH NAME -avahi-resolve \- Resolve one or more mDNS/DNS host name(s) to IP address(es) (and vice versa) using the Avahi daemon -.SH SYNOPSIS -\fBavahi-resolve --name \fIhost-name ...\fB - -avahi-resolve-host-name \fIhost-name ...\fB - -avahi-resolve --address \fIaddress ...\fB - -avahi-resolve-address \fIaddress ...\fB -\f1 -.SH DESCRIPTION -Resolve one or more mDNS/DNS host name(s) to IP address(es) (and vice versa) using the Avahi daemon. -.SH OPTIONS -When passing -n, specify one or more fully qualified mDNS/DNS host name(s) (e.g. "foo.local") to resolve into IP addresses on the command line. - -When passing -a, specify one or more IP addresses to resolve into host names. When \fBenable-wide-area\f1 is set to yes in \fBavahi-daemon.conf(5)\f1, reverse lookups will go over unicast DNS first and fallback to mDNS. - -avahi-resolve-host-name is equivalent to avahi-resolve --name. - -avahi-resolve-address is equivalent to avahi-resolve --address. -.TP -\fB-n | --name\f1 -Translate one or more fully qualified host names into addresses. -.TP -\fB-a | --address\f1 -Translate one or more addresses into fully qualified host names. -.TP -\fB-v | --verbose\f1 -Enable verbose mode. -.TP -\fB-6\f1 -When resolving a host name, look for IPv6 addresses exclusively. -.TP -\fB-4\f1 -When resolving a host name, look for IPv4 addresses exclusively. -.TP -\fB-h | --help\f1 -Show help. -.TP -\fB-V | --version\f1 -Show version information. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-publish-address(1)\f1, \fBavahi-daemon(8)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man1/avahi-set-host-name.1 b/network/avahi/man/man1/avahi-set-host-name.1 deleted file mode 100644 index 9444083006..0000000000 --- a/network/avahi/man/man1/avahi-set-host-name.1 +++ /dev/null @@ -1,24 +0,0 @@ -.TH avahi-set-host-name 1 User Manuals -.SH NAME -avahi-set-host-name \- Change mDNS host name -.SH SYNOPSIS -\fBavahi-set-host-name \fIhost-name\fB -\f1 -.SH DESCRIPTION -Set the mDNS host name of a currently running Avahi daemon. The effect of this operation is not persistent across daemon restarts. This operation is usually privileged. -.SH OPTIONS -.TP -\fB-v | --verbose\f1 -Enable verbose mode. -.TP -\fB-h | --help\f1 -Show help. -.TP -\fB-V | --version\f1 -Show version information. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-daemon(8)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man1/bssh.1 b/network/avahi/man/man1/bssh.1 deleted file mode 100644 index 913554eb30..0000000000 --- a/network/avahi/man/man1/bssh.1 +++ /dev/null @@ -1,36 +0,0 @@ -.TH bssh/bvnc/bshell 1 User Manuals -.SH NAME -bssh/bvnc/bshell \- Browse for SSH/VNC servers on the local network -.SH SYNOPSIS -\fBbssh - -bvnc - -bshell -\f1 -.SH DESCRIPTION -bssh/bvnc/bshell browses for SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/vncviewer after a selection was made. - -If the binary is called as bssh only ssh servers will be shown. If the binary is called as bvnc only VNC servers will be shown. If the binary is called as bshell both VNC and SSH servers are shown. -.SH OPTIONS -.TP -\fB-s | --ssh\f1 -Browse for SSH servers (and only SSH servers) regardless under which name the binary is called. -.TP -\fB-v | --vnc\f1 -Browse for VNC servers (and only VNC servers) regardless under which name the binary is called. -.TP -\fB-S | --shell\f1 -Browse for both VNC and SSH servers regardless under which name the binary is called. -.TP -\fB-d | --domain=\f1 \fIDOMAIN\f1 -Browse in the specified domain. If omitted bssh/bvnc/bshell will browse in the default browsing domain (usually .local) -.TP -\fB-h | --help\f1 -Show help. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBvncviewer(1)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man5/avahi-daemon.conf.5 b/network/avahi/man/man5/avahi-daemon.conf.5 deleted file mode 100644 index 064921ca5e..0000000000 --- a/network/avahi/man/man5/avahi-daemon.conf.5 +++ /dev/null @@ -1,102 +0,0 @@ -.TH avahi-daemon.conf 5 User Manuals -.SH NAME -avahi-daemon.conf \- avahi-daemon configuration file -.SH SYNOPSIS -\fB/etc/avahi/avahi-daemon.conf -\f1 -.SH DESCRIPTION -\fIavahi-daemon.conf\f1 is the configuration file for avahi-daemon. -.SH SECTION [SERVER] -.TP -\fBhost-name=\f1 Set the host name avahi-daemon tries to register on the LAN. If omitted defaults to the system host name as set with the sethostname() system call. -.TP -\fBhost-name-from-machine-id=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will use the \fBmachine-id(5)\f1 as name on the LAN. It should be noted that this ID uniquely identifies the host. It should be considered "confidential", and must not be exposed in untrusted environments. Defaults to "no". -.TP -\fBdomain-name=\f1 Set the default domain name avahi-daemon tries to register its host name and services on the LAN in. If omitted defaults to ".local". -.TP -\fBbrowse-domains=\f1 Set a comma separated list of browsing domains (in addition to the default one and those announced inside the default browsing domain). Please note that the user may specify additional browsing domains on the client side, either by setting $AVAHI_BROWSE_DOMAINS to a list of colon separated domains or by adding them to the XDG config file \fI~/.config/avahi/browse-domains\f1 (separated by newlines). -.TP -\fBuse-ipv4=\f1 Takes a boolean value ("yes" or "no"). If set to "no" avahi-daemon will not use IPv4 sockets. Default is "yes". -.TP -\fBuse-ipv6=\f1 Takes a boolean value ("yes" or "no"). If set to "no" avahi-daemon will not use IPv6 sockets. Default is "yes". -.TP -\fBallow-interfaces=\f1 Set a comma separated list of allowed network interfaces that should be used by the avahi-daemon. Traffic on other interfaces will be ignored. If set to an empty list all local interfaces except loopback and point-to-point will be used. -.TP -\fBdeny-interfaces=\f1 Set a comma separated list of network interfaces that should be ignored by avahi-daemon. Other not specified interfaces will be used, unless \fBallow-interfaces=\f1 is set. This option takes precedence over \fBallow-interfaces=\f1. -.TP -\fBcheck-response-ttl=\f1 Takes a boolean value ("yes" or "no"). If set to "yes", an additional security check is activated: incoming IP packets will be ignored unless the IP TTL is 255. Earlier mDNS specifications required this check. Since this feature may be incompatible with newer implementations of mDNS it defaults to "no". On the other hand it provides extra security. -.TP -\fBuse-iff-running=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon monitors the IFF_RUNNING flag bit which is used by some (modern) network drivers to tell user space if a network cable is plugged in (in case of copper ethernet), or the network card is associated with some kind of network (in case of WLAN). If IFF_RUNNING is set avahi-daemon will automatically announce its services on that network. Unfortunately far too many network drivers do not support this flag or support it in a broken way. Therefore this option defaults to "no". -.TP -\fBenable-dbus=\f1 Takes either "yes", "no" or "warn". If set to "yes" avahi-daemon connects to D-Bus, offering an object oriented client API. It is only available if Avahi has been compiled with \fB--enable-dbus\f1 in which case it defaults to "yes". "warn" behaves like "yes", but the daemon starts up even when it fails to connect to a D-Bus daemon. In addition, if the connection to the D-Bus daemon is terminated we try to reconnect. (Unless we are in a chroot() environment where this definitely will fail.) -.TP -\fBdisallow-other-stacks=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" no other process is allowed to bind to UDP port 5353. This effectively impedes other mDNS stacks from running on the host. Use this as a security measure to make sure that only Avahi is responsible for mDNS traffic. Please note that we do not recommend running multiple mDNS stacks on the same host simultaneously. This hampers reliability and is a waste of resources. However, to not annoy people this option defaults to "no". -.TP -\fBallow-point-to-point=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will make use of interfaces with the POINTOPOINT flag set. This option defaults to "no" as it might make mDNS unreliable due to usually large latencies with such links and opens a potential security hole by allowing mDNS access from Internet connections. Use with care and YMMV! -.TP -\fBcache-entries-max=\f1 Takes an unsigned integer specifying how many resource records are cached per interface. Bigger values allow mDNS work correctly in large LANs but also increase memory consumption. -.TP -\fBclients-max=\f1 Takes an unsigned integer. The maximum number of concurrent D-Bus clients allowed. If the maximum number is reached further clients will be refused until at least one existing client disconnects. -.TP -\fBobjects-per-client-max=\f1 Takes an unsigned integer. The maximum number of objects (entry groups, browsers, resolvers) that may be registered per D-Bus client at a time. If the maximum number is reached further object creation will be refused until at least one object is freed. -.TP -\fBentries-per-entry-group-max=\f1 Takes an unsigned integer. The maximum number of entries (resource records) per entry group registered by a D-Bus client at a time. If the maximum number is reached further resource records may not be added to an entry group. -.TP -\fBratelimit-interval-usec=\f1 Takes an unsigned integer. Sets the per-interface packet rate-limiting interval parameter. Together with \fBratelimit-burst=\f1 this may be used to control the maximum number of packets Avahi will generated in a specific period of time on an interface. -.TP -\fBratelimit-burst=\f1 Takes an unsigned integer. Sets the per-interface packet rate-limiting burst parameter. Together with \fBratelimit-interval-usec=\f1 this may be used to control the maximum number of packets Avahi will generated in a specific period of time on an interface. -.SH SECTION [WIDE-AREA] -.TP -\fBenable-wide-area=\f1 Takes a boolean value ("yes" or "no"). Enable wide-area DNS-SD, aka DNS-SD over unicast DNS. If this is enabled only domains ending in .local will be resolved on mDNS, all other domains are resolved via unicast DNS. When this is enabled, unless explicitly specified reverse lookups will go over unicast DNS and fall back to mDNS if unicast DNS lookups fail. If you want to maintain multiple different multicast DNS domains even with this option enabled we encourage you to use subdomains of .local, such as "kitchen.local". This option defaults to "no". -.SH SECTION [PUBLISH] -.TP -\fBdisable-publishing=\f1 Takes a boolean value ("yes" or "no"). If set to "yes", no record will be published by Avahi, not even address records for the local host. Avahi will be started in a querying-only mode. Use this is a security measure. This option defaults to "no" -.TP -\fBdisable-user-service-publishing=\f1 Takes a boolean value ("yes" or "no"). If set to "yes", Avahi will still publish address records and suchlike but will not allow user applications to publish services. Use this is a security measure. This option defaults to "no" -.TP -\fBadd-service-cookie=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" an implicit TXT entry will be added to all locally registered services, containing a cookie value which is chosen randomly on daemon startup. This can be used to detect if two services on two different interfaces/protocols are actually identical. Defaults to "no". -.TP -\fBpublish-addresses=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will register mDNS address records for all local IP addresses. Unless you want to use avahi-daemon exclusively for browsing it's recommended to enable this. If you plan to register local services you need to enable this option. Defaults to "yes". -.TP -\fBpublish-hinfo=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will register an mDNS HINFO record on all interfaces which contains information about the local operating system and CPU, which might be useful for administrative purposes. This is recommended by the mDNS specification but not required. For the sake of privacy you might choose to disable this feature. Defaults to "no". -.TP -\fBpublish-workstation=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will register a service of type "_workstation._tcp" on the local LAN. This might be useful for administrative purposes (i.e. browse for all PCs on the LAN), but is not required or recommended by any specification. Newer MacOS X releases register a service of this type. Defaults to "no". -.TP -\fBpublish-domain=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will announce the locally used domain name (see above) for browsing by other hosts. Defaults to "yes". -.TP -\fBpublish-dns-servers=\f1 Takes a comma separated list of IP addresses for unicast DNS servers. You can use this to announce unicast DNS servers via mDNS. When used in conjunction with avahi-dnsconfd on the client side this allows DHCP-like configuration of unicast DNS servers. -.TP -\fBpublish-resolv-conf-dns-servers=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will publish the unicast DNS servers specified in \fI/etc/resolv.conf\f1 in addition to those specified with \fBpublish-dns-servers\f1. Send avahi-daemon a SIGHUP to have it reload this file. Defaults to "no". -.TP -\fBpublish-aaaa-on-ipv4=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will publish an IPv6 AAAA record via IPv4, i.e. the local IPv6 addresses can be resolved using an IPv4 transport. Only useful when IPv4 is enabled with \fBuse-ipv4=true\f1. Defaults to "yes". -.TP -\fBpublish-a-on-ipv6=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will publish an IPv4 A record via IPv6, i.e. the local IPv4 addresses can be resolved using an IPv6 transport. Only useful when IPv6 is enabled with \fBuse-ipv6=true\f1. Defaults to "no". -.SH SECTION [REFLECTOR] -.TP -\fBenable-reflector=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will reflect incoming mDNS requests to all local network interfaces, effectively allowing clients to browse mDNS/DNS-SD services on all networks connected to the gateway. The gateway is somewhat intelligent and should work with all kinds of mDNS traffic, though some functionality is lost (specifically the unicast reply bit, which is used rarely anyway). Make sure to not run multiple reflectors between the same networks, this might cause them to play Ping Pong with mDNS packets. Defaults to "no". -.TP -\fBreflect-ipv=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" and \fBenable-reflector\f1 is enabled, avahi-daemon will forward mDNS traffic between IPv4 and IPv6, which is usually not recommended. Defaults to "no". -.TP -\fBreflect-filters=\f1 Set a comma separated list of allowed service names to be reflected. Each service that is seen must match an entry in this list to be reflected to other networks. This list can match the type of service or the name of the machine providing the service. Defaults to allowing all services. -.SH SECTION [RLIMITS] -This section is used to define system resource limits for the daemon. See \fBsetrlimit(2)\f1 for more information. If any of the options is not specified in the configuration file, avahi-daemon does not change it from the system defaults. -.TP -\fBrlimit-as=\f1 Value in bytes for RLIMIT_AS (maximum size of the process's virtual memory). Sensible values are heavily system dependent. -.TP -\fBrlimit-core=\f1 Value in bytes for RLIMIT_CORE (maximum core file size). Unless you want to debug avahi-daemon, it is safe to set this to 0. -.TP -\fBrlimit-data=\f1 Value in bytes for RLIMIT_DATA (maximum size of the process's data segment). Sensible values are heavily system dependent. -.TP -\fBrlimit-fsize=\f1 Value for RLIMIT_FSIZE (maximum size of files the process may create). Since avahi-daemon shouldn't write any files to disk, it is safe to set this to 0. -.TP -\fBrlimit-nofile=\f1 Value for RLIMIT_NOFILE (open file descriptors). avahi-daemon shouldn't need more than 15 to 20 open file descriptors concurrently. -.TP -\fBrlimit-stack=\f1 Value in bytes for RLIMIT_STACK (maximum size of the process stack). Sensible values are heavily system dependent. -.TP -\fBrlimit-nproc=\f1 Value for RLIMIT_NPROC (max number of processes a user can launch). avahi-daemon forks of a helper process on systems where \fBchroot(2)\f1 is available therefore this value should not be set below 2. Note that while the process limit only applies to this process, the total count of processes to reach that limit includes all processes on the system with the same UID, including any containers without UID remapping (such as lxd containers with security.privileged=true). The default configuration of 3 was removed to prevent problems in this scenario. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-daemon(8)\f1, \fBavahi-dnsconfd(8)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man5/avahi.hosts.5 b/network/avahi/man/man5/avahi.hosts.5 deleted file mode 100644 index dc4f73fa63..0000000000 --- a/network/avahi/man/man5/avahi.hosts.5 +++ /dev/null @@ -1,16 +0,0 @@ -.TH avahi.hosts 5 User Manuals -.SH NAME -avahi.hosts \- avahi-daemon static host name file -.SH SYNOPSIS -\fB/etc/avahi/hosts -\f1 -.SH DESCRIPTION -\fI/etc/avahi/hosts\f1 is a file which may be used to define static host name to IP address mappings for multicast DNS. This is especially useful when publishing DNS-SD services on behalf of other hosts. See \fBavahi.service(5)\f1 for more information. - -The file format is similar to the one of \fI/etc/hosts\f1: on each line an IP address and the corresponding host name. The host names should be in FQDN form, i.e. with appended .local suffix. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-daemon(8)\f1, \fBavahi.service(5)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man5/avahi.service.5 b/network/avahi/man/man5/avahi.service.5 deleted file mode 100644 index f56d7a6794..0000000000 --- a/network/avahi/man/man5/avahi.service.5 +++ /dev/null @@ -1,41 +0,0 @@ -.TH avahi.service 5 User Manuals -.SH NAME -avahi.service \- avahi-daemon static service file -.SH SYNOPSIS -\fB/etc/avahi/services/*.service -\f1 -.SH DESCRIPTION -\fI/etc/avahi/services/*.service\f1 are XML fragments containing static DNS-SD service data. Every service file can contain multiple service definitions which share the same name. This is useful for publishing service data for services which implement multiple protocols. (i.e. a printer implementing _ipp._tcp and _printer._tcp) -.SH XML TAGS -.TP -\fB\f1 The document tag of avahi service files. Should contain one \fB\f1 and one or more \fB\f1 elements. -.TP -\fB\f1 The service name. If \fBreplace-wildcards\f1 is "yes", any occurrence of the string "%h" will be replaced by the local host name. This can be used for service names like "Remote Terminal on %h". If \fBreplace-wildcards\f1 is not specified, defaults to "no". -.TP -\fB\f1 Contains the service information for exactly one service type. Should contain one \fB\f1 and one \fB\f1 element. Optionally it may contain one \fB\f1, one \fB\f1, any number of \fB\f1 and any number of \fB\f1 elements. The attribute \fBprotocol\f1 specifies the protocol to advertise the service on. If \fBany\f1 is used (which is the default), the service will be advertised on both IPv4 and IPv6. -.TP -\fB\f1 Contains the DNS-SD service type for this service. e.g. "_http._tcp". -.TP -\fB\f1 Contains an additional DNS-SD service subtype for this service. e.g. "_anon._sub._ftp._tcp". -.TP -\fB\f1 The domain name this service should be registered. If omitted defaults to the default domain of the avahi daemon. (probably .local) -.TP -\fB\f1 The host name of the host that provides this service. This should be a host that is resolvable by multicast or unicast DNS. Please note that you need to specify a fully-qualified domain name (FQDN) here, i.e. .local is not appended implicitly! The host name doesn't need to be part of the domain specified in \fB\f1. See \fBavahi.hosts(5)\f1 for more information how to publish additional host name mappings. -.TP -\fB\f1 The IP port number the service listens on. -.TP -\fB\f1 DNS-SD TXT record data. If \fBvalue-format\f1 is "text", the value of the TXT record is taken verbatim. If \fBvalue-format\f1 is "binary-hex" then the value of TXT record is decoded by taking pairs of characters after the "=" char and interpreting them as the textual representation of the two-digit hexadecimal number. Both uppercase and lowercase hexadecimal digits are allowed. The 0x or 0X prefix is not allowed. This requires the length of the value to be even. If \fBvalue-format\f1 is "binary-base64" then the value of TXT record is decoded with a base64 decoder. The character set used is A-Za-z0-9+/. This requires the length of the value to be a multiple of 4, with "=" as padding at the end. If \fBvalue-format\f1 is not specified, defaults to "text". Examples (all the values are decoded to the string "value" without quotes): - -key=value - -key=value - -key=76616c7565 - -key=dmFsdWU= -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-daemon(8)\f1, \fBavahi.hosts(5)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man8/avahi-daemon.8 b/network/avahi/man/man8/avahi-daemon.8 deleted file mode 100644 index bf592f2da6..0000000000 --- a/network/avahi/man/man8/avahi-daemon.8 +++ /dev/null @@ -1,76 +0,0 @@ -.TH avahi-daemon 8 User Manuals -.SH NAME -avahi-daemon \- The Avahi mDNS/DNS-SD daemon -.SH SYNOPSIS -\fBavahi-daemon [\fIoptions\fB] - -avahi-daemon --kill\fB - -avahi-daemon --reload\fB - -avahi-daemon --check\fB -\f1 -.SH DESCRIPTION -The Avahi mDNS/DNS-SD daemon implements Apple's Zeroconf architecture (also known as "Rendezvous" or "Bonjour"). The daemon registers local IP addresses and static services using mDNS/DNS-SD and provides two IPC APIs for local programs to make use of the mDNS record cache the avahi-daemon maintains. First there is the so called "simple protocol" which is used exclusively by avahi-dnsconfd (a daemon which configures unicast DNS servers using server info published via mDNS) and nss-mdns (a libc NSS plugin, providing name resolution via mDNS). Finally there is the D-Bus interface which provides a rich object oriented interface to D-Bus enabled applications. - -Upon startup avahi-daemon interprets its configuration file \fI/etc/avahi/avahi-daemon.conf\f1 and reads XML fragments from \fI/etc/avahi/services/*.service\f1 which may define static DNS-SD services. If you enable \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1 the file \fI/etc/resolv.conf\f1 will be read, too. -.SH OPTIONS -.TP -\fB-f | --file=\f1 \fIFILE\f1 -Specify the configuration file to read. (default: /etc/avahi/avahi-daemon.conf) -.TP -\fB-D | --daemonize\f1 -Daemonize after startup. Implies \fB--syslog\f1. -.TP -\fB-s | --syslog\f1 -Log to syslog instead of STDERR. Implied by \fB--daemonize\f1. -.TP -\fB--debug\f1 -Increase verbosity to debug level. -.TP -\fB--no-rlimits\f1 -Don't enforce resource limits as specified in the configuration file. (See \fBsetrlimit(2)\f1 for more information) -.TP -\fB--no-drop-root\f1 -Don't drop root privileges after startup and don't require daemon to be started as root. We recommend not to use this option. -.TP -\fB--no-chroot\f1 -Don't \fBchroot(2)\f1 the daemon. This option is only available when compiled with chroot() support. -.TP -\fB--no-proc-title\f1 -Don't change the process name while running. Unless this option is specified avahi-daemon will reflect its current state and the selected host name in the process title. -.TP -\fB-k | --kill\f1 -Kill an already running avahi-daemon. (equivalent to sending a SIGTERM) -.TP -\fB-r | --reload\f1 -Tell an already running avahi-daemon to reread \fI/etc/resolv.conf\f1 (in case you enabled \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1) and the files from \fI/etc/avahi/services/\f1. Please note that this will not reload the \fI/etc/avahi/avahi-daemon.conf\f1. (equivalent to sending a SIGHUP) -.TP -\fB-c | --check\f1 -Return 0 as return code when avahi-daemon is already running. -.TP -\fB-h | --help\f1 -Show help -.TP -\fB-v | --version\f1 -Show version information -.SH FILES -\fI/etc/avahi/avahi-daemon.conf\f1: the default configuration file for avahi-daemon, see \fBavahi-daemon.conf(5)\f1 for more information. - -\fI/etc/avahi/hosts\f1: additional static hostname mappings to publish in mDNS, see \fBavahi.hosts(5)\f1 for more information. - -\fI/etc/avahi/services/*.service\f1: static service definitions, see \fBavahi.service(5)\f1 for more information. -.SH SIGNALS -\fISIGINT, SIGTERM\f1: avahi-daemon will shutdown. (Same as \fB--kill\f1). - -\fISIGHUP\f1: avahi-daemon will reload unicast DNS server data from \fI/etc/resolv.conf\f1 and static service definitions from \fI/etc/avahi/services/\f1. (Same as \fB--reload\f1) - -\fISIGUSR1\f1: avahi-daemon will dump local and remote cached resource record data to syslog. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-daemon.conf(5)\f1, \fBavahi.hosts(5)\f1, \fBavahi.service(5)\f1, \fBavahi-dnsconfd(8)\f1, \fBavahi-set-host-name(1)\f1 - -http://avahi.org/wiki/AvahiAndUnicastDotLocal documents the problems when using Avahi in a unicast DNS zone .local. -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man8/avahi-dnsconfd.8 b/network/avahi/man/man8/avahi-dnsconfd.8 deleted file mode 100644 index 941547597e..0000000000 --- a/network/avahi/man/man8/avahi-dnsconfd.8 +++ /dev/null @@ -1,48 +0,0 @@ -.TH avahi-dnsconfd 8 User Manuals -.SH NAME -avahi-dnsconfd \- Unicast DNS server from mDNS/DNS-SD configuration daemon -.SH SYNOPSIS -\fBavahi-dnsconfd [\fIoptions\fB] - -avahi-dnsconfd --kill\fB - -avahi-dnsconfd --refresh\fB - -avahi-dnsconfd --check\fB -\f1 -.SH DESCRIPTION -avahi-dnsconfd connects to a running avahi-daemon and runs the script \fI/etc/avahi/avahi-dnsconfd.action\f1 for each unicast DNS server that is announced on the local LAN. This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS. -.SH OPTIONS -.TP -\fB-D | --daemonize\f1 -Daemonize after startup and redirect log messages to syslog. -.TP -\fB-s | --syslog\f1 -Log to syslog instead of STDERR. Implied by \fB--daemonize\f1. -.TP -\fB-k | --kill\f1 -Kill an already running avahi-dnsconfd. (equivalent to sending a SIGTERM) -.TP -\fB-r | --refresh\f1 -Tell an already running avahi-dnsconfd to refresh the DNS server data. (equivalent to sending a SIGHUP) -.TP -\fB-c | --check\f1 -Return 0 as return code when avahi-dnsconfd is already running. -.TP -\fB-h | --help\f1 -Show help -.TP -\fB-v | --version\f1 -Show version information -.SH FILES -\fI/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed. -.SH SIGNALS -\fISIGINT, SIGTERM\f1: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon. - -\fISIGHUP\f1: avahi-dnsconfd will refresh the DNS server data. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-daemon(8)\f1, \fBavahi-dnsconfd.action(8)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man8/avahi-dnsconfd.action.8 b/network/avahi/man/man8/avahi-dnsconfd.action.8 deleted file mode 100644 index 3f2f16a3d0..0000000000 --- a/network/avahi/man/man8/avahi-dnsconfd.action.8 +++ /dev/null @@ -1,30 +0,0 @@ -.TH avahi-dnsconfd.action 8 User Manuals -.SH NAME -avahi-dnsconfd.action \- avahi-dnsconfd action script -.SH SYNOPSIS -\fB/etc/avahi/avahi-dnsconfd.action -\f1 -.SH DESCRIPTION -\fIavahi-dnsconfd.action\f1 is the action script that is called whenever a new unicast DNS server is found or removed by avahi-dnsconfd. The default script as shipped with avahi patches \fI/etc/resolv.conf\f1 to reflect the changed unicast DNS server configuration. -.SH PARAMETERS -.TP -\fBargv[1]\f1 Contains the character "+" if the DNS server is new, "-" when it shall be removed from the DNS server list. -.TP -\fBargv[2]\f1 The IP address of the DNS server. -.TP -\fBargv[3]\f1 Numerical network interface number this DNS server was found on. -.TP -\fBargv[4]\f1 Numerical protocol number this DNS server was found on. (usually 2 for IPv4 and 10 for IPv6) -.SH ENVIRONMENT -.TP -\fBAVAHI_INTERFACE\f1 Contains the textual interface name the corresponds with argv[3]. (e.g. "eth0") -.TP -\fBAVAHI_INTERFACE_DNS_SERVERS\f1 Contains a list of all DNS servers that avahi-dnsconfd found on the interface \fB$AVAHI_INTERFACE\f1, separated by spaces. -.TP -\fBAVAHI_DNS_SERVERS\f1 Contains a list of all DNS server that avahi-dnsconfd found on all interfaces, separated by spaces. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-dnsconfd(8)\f1, \fBavahi-daemon(8)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/patches/fixup_avahi-dnsconfd.action.patch b/network/avahi/patches/fixup_avahi-dnsconfd.action.patch deleted file mode 100644 index 88f9b5f807..0000000000 --- a/network/avahi/patches/fixup_avahi-dnsconfd.action.patch +++ /dev/null @@ -1,69 +0,0 @@ -avahi-dnsconfd.action looks for /sbin/netconfig, and if found, attempts to -use it to modify /etc/resolv.conf. While *our* netconfig and SuSE's -netconfig started out the same, they're quite different these days, and -thus the result is /etc/HOSTNAME getting set to some nonsense such as: - INTERFACE='eth0'.DNSSERVERS='192.168.13.1' -This was quite some fun tracking down, by the way... :-) --rworkman - - -diff -Nur avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action ---- avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action 2010-06-28 22:30:34.000000000 -0500 -+++ avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action 2012-01-21 16:18:24.337986754 -0600 -@@ -33,48 +33,16 @@ - # $AVAHI_INTERFACE_DNS_SERVERS A whitespace seperated list of DNS servers on $AVAHI_INTERFACE - # $AVAHI_DNS_SERVERS The complete list of all DNS servers found on all interfaces - --if [ -x /sbin/netconfig ]; then -- # SUSE method on 11.1+ -- if [ -n "$AVAHI_INTERFACE_DNS_SERVERS" ]; then -- /sbin/netconfig modify -s avahi -i "$AVAHI_INTERFACE" <<-EOF -- INTERFACE='$AVAHI_INTERFACE' -- DNSSERVERS='$AVAHI_INTERFACE_DNS_SERVERS' -- EOF -- else -- /sbin/netconfig remove -s avahi -i "$AVAHI_INTERFACE" -- fi --elif [ -x /sbin/modify_resolvconf ] ; then -- # method for SUSE <= 11.0 -- if [ -n "$AVAHI_DNS_SERVERS" ]; then -- /sbin/modify_resolvconf modify -s avahi -t - -p avahi-dnsconfd -n "$AVAHI_DNS_SERVERS" <<-EOF -- if you don't like avahi to update your Nameservers -- disable the avahi-dnsconfd init script -- EOF -- else -- /sbin/modify_resolvconf restore -s avahi -- fi --elif [ -x /sbin/resolvconf ] ; then - -- # We have Debian's resolvconf tool -- -- if [ "x$AVAHI_INTERFACE_DNS_SERVERS" = "x" ] ; then -- /sbin/resolvconf -d "$AVAHI_INTERFACE.avahi" -- else -- for n in $AVAHI_INTERFACE_DNS_SERVERS ; do -- echo "nameserver $n" -- done | /sbin/resolvconf -a "$AVAHI_INTERFACE.avahi" -- fi --else -- -- # No resolvconf tool available -- -- if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then -+if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then - test -f /etc/resolv.conf.avahi && mv /etc/resolv.conf.avahi /etc/resolv.conf -- else -+else - test -f /etc/resolv.conf.avahi || mv /etc/resolv.conf /etc/resolv.conf.avahi - -- for n in $AVAHI_DNS_SERVERS ; do -- echo "nameserver $n" -- done > /etc/resolv.conf -- fi -+ grep -v ^nameserver /etc/resolv.conf.avahi > /etc/resolv.conf -+ -+ for n in $AVAHI_DNS_SERVERS ; do -+ echo "nameserver $n" -+ done >> /etc/resolv.conf - fi -+ - diff --git a/network/avahi/slack-desc b/network/avahi/slack-desc deleted file mode 100644 index 7e2b027fe3..0000000000 --- a/network/avahi/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -avahi: avahi (service discovery aka Zeroconf) -avahi: -avahi: Avahi is a system which facilitates service discovery on a local -avahi: network via the mDNS/DNS-SD protocol suite. This enables you to plug -avahi: your laptop or computer into a network and instantly be able to view -avahi: other people who you can chat with, find printers to print to, or find -avahi: files being shared. -avahi: -avahi: Homepage: https://avahi.org -avahi: -avahi: diff --git a/network/bitchx/bitchx.SlackBuild b/network/bitchx/bitchx.SlackBuild index a8ecee895f..407ec18f16 100644 --- a/network/bitchx/bitchx.SlackBuild +++ b/network/bitchx/bitchx.SlackBuild @@ -70,7 +70,7 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ SHLIB_LD="gcc -shared -Wl,-s" \ LDFLAGS="-Wl,-s" \ -CFLAGS="$SLKCFLAGS -fcommon" \ +CFLAGS="$SLKCFLAGS -fcommon -std=gnu89 -Wno-error -Wno-int-conversion" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/broadcom-wl/broadcom-wl.SlackBuild b/network/broadcom-wl/broadcom-wl.SlackBuild index 53b7c31ebc..9fc56eceb9 100644 --- a/network/broadcom-wl/broadcom-wl.SlackBuild +++ b/network/broadcom-wl/broadcom-wl.SlackBuild @@ -110,6 +110,9 @@ patch -p1 < $CWD/patches/020-linux615.patch || exit 1 sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_iw.c sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_cfg80211_hybrid.c +# This header moved with 6.12.x +sed -i 's|asm/unaligned.h|linux/unaligned.h|' src/wl/sys/wl_linux.c + env -u ARCH make -C /lib/modules/$KERNEL/build M=$(pwd) clean env -u ARCH make -C /lib/modules/$KERNEL/build M=$(pwd) diff --git a/network/claws-mail/claws-mail.SlackBuild b/network/claws-mail/claws-mail.SlackBuild index 135dbb2a6f..0eb1941ebe 100644 --- a/network/claws-mail/claws-mail.SlackBuild +++ b/network/claws-mail/claws-mail.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=claws-mail -VERSION=${VERSION:-4.1.1} +VERSION=${VERSION:-4.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -101,7 +101,7 @@ gzip -9 $PKG/usr/man/man?/*.? mkdir -p $PKG/usr/doc mv $PKG/usr/share/doc/claws-mail $PKG/usr/doc/$PRGNAM-$VERSION rm -rf $PKG/usr/share/doc -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ +cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/claws-mail/claws-mail.info b/network/claws-mail/claws-mail.info index 5288da0251..c51bede52b 100644 --- a/network/claws-mail/claws-mail.info +++ b/network/claws-mail/claws-mail.info @@ -1,8 +1,8 @@ PRGNAM="claws-mail" -VERSION="4.1.1" +VERSION="4.3.1" HOMEPAGE="https://www.claws-mail.org/" -DOWNLOAD="https://www.claws-mail.org/releases/claws-mail-4.1.1.tar.xz" -MD5SUM="bde1fdfcc082aa629d8704cba56a8cf6" +DOWNLOAD="https://www.claws-mail.org/releases/claws-mail-4.3.1.tar.xz" +MD5SUM="a3e05229f523ab2156f001815c575428" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libetpan" diff --git a/network/curl-quic/curl-quic.SlackBuild b/network/curl-quic/curl-quic.SlackBuild index d262f7f9e8..635b8715c7 100644 --- a/network/curl-quic/curl-quic.SlackBuild +++ b/network/curl-quic/curl-quic.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=curl-quic TGZNAM=curl -VERSION=${VERSION:-8.6.0} +VERSION=${VERSION:-8.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/curl-quic/curl-quic.info b/network/curl-quic/curl-quic.info index fb673d3467..6158587a3d 100644 --- a/network/curl-quic/curl-quic.info +++ b/network/curl-quic/curl-quic.info @@ -1,8 +1,8 @@ PRGNAM="curl-quic" -VERSION="8.6.0" +VERSION="8.10.1" HOMEPAGE="https://curl.se/" -DOWNLOAD="https://github.com/curl/curl/releases/download/curl-8_6_0/curl-8.6.0.tar.gz" -MD5SUM="6178ea567611c2aaffafc88f91fb4238" +DOWNLOAD="https://github.com/curl/curl/releases/download/curl-8_10_1/curl-8.10.1.tar.gz" +MD5SUM="94480849689e8b5dd41017a98e253544" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nghttp3 ngtcp2" diff --git a/network/dsniff/dsniff.SlackBuild b/network/dsniff/dsniff.SlackBuild index 3c6d9d03ad..d5fcc40773 100644 --- a/network/dsniff/dsniff.SlackBuild +++ b/network/dsniff/dsniff.SlackBuild @@ -87,7 +87,7 @@ for i in $CWD/patches/*.patch; do patch -p1 < $i; done autoreconf -fi -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-incompatible-pointer-types" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/network/ettercap/ettercap.SlackBuild b/network/ettercap/ettercap.SlackBuild index c2aff5dbf0..30b03da94f 100644 --- a/network/ettercap/ettercap.SlackBuild +++ b/network/ettercap/ettercap.SlackBuild @@ -94,6 +94,7 @@ cd build -DBUNDLED_LIBS=OFF \ -DENABLE_IPV6=$IPV6 \ -DENABLE_LUA=$LUA \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/network/fail2ban/fail2ban.SlackBuild b/network/fail2ban/fail2ban.SlackBuild index 1262249d06..452de3b9f1 100644 --- a/network/fail2ban/fail2ban.SlackBuild +++ b/network/fail2ban/fail2ban.SlackBuild @@ -74,7 +74,14 @@ sed -i 's|_daemon = sshd|_daemon = sshd(?:-session)?|' config/filter.d/sshd.conf sed -i 's|self.install_dir|"/usr/bin"|' setup.py sed -i 's/^before = paths-debian.conf/before = paths-slackware.conf/' config/jail.conf -python3 setup.py install --root=$PKG +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl + +# unfortunately the install routines are a bit fishy... +( cd $PKG + cp -rl .$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/{etc,usr} . + rm -fR .$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/{etc,usr} + find -L etc -type d -name "__pycache__" -exec rm -fr {} \; || true ) # installing man pages mkdir -p $PKG/usr/man/{man1,man5} diff --git a/network/glusterfs/glusterfs.SlackBuild b/network/glusterfs/glusterfs.SlackBuild index 3ded72e7ab..c7b72e11ac 100644 --- a/network/glusterfs/glusterfs.SlackBuild +++ b/network/glusterfs/glusterfs.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=glusterfs -VERSION=${VERSION:-4.1.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-11.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -80,7 +77,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; ./autogen.sh -CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \ +CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -89,9 +86,11 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --without-tcmalloc \ + --enable-gnfs \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG +make -j1 install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -99,21 +98,16 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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/etc/$PRGNAM/gluster-rsyslog-5.8.conf \ - $PKG/etc/$PRGNAM/gluster-rsyslog-7.2.conf - install -D -m 0644 extras/command-completion/gluster.bash \ $PKG/usr/share/bash-completion/completions/gluster -mv $PKG/etc/$PRGNAM/eventsconfig.json $PKG/etc/$PRGNAM/eventsconfig.json.new -mv $PKG/etc/$PRGNAM/glusterd.vol $PKG/etc/$PRGNAM/glusterd.vol.new -mv $PKG/etc/$PRGNAM/group-gluster-block $PKG/etc/$PRGNAM/group-gluster-block.new -mv $PKG/etc/$PRGNAM/group-metadata-cache $PKG/etc/$PRGNAM/group-metadata-cache.new -mv $PKG/etc/$PRGNAM/group-nl-cache $PKG/etc/$PRGNAM/group-nl-cache.new -mv $PKG/etc/$PRGNAM/group-virt.example $PKG/etc/$PRGNAM/group-virt.example.new -mv $PKG/etc/$PRGNAM/gsyncd.conf $PKG/etc/$PRGNAM/gsyncd.conf.new -mv $PKG/etc/$PRGNAM/logger.conf.example $PKG/etc/$PRGNAM/logger.conf.example.new +for i in \ + eventsconfig.json gluster-rsyslog-5.8.conf gluster-rsyslog-7.2.conf \ + glusterd.vol group-db-workload group-distributed-virt group-gluster-block \ + group-metadata-cache group-nl-cache group-samba gsyncd.conf thin-arbiter.vol \ + ; do + mv $PKG/etc/$PRGNAM/${i} $PKG/etc/$PRGNAM/${i}.new +done mkdir -p $PKG/etc/logrotate.d mv $PKG/etc/$PRGNAM/glusterfs-logrotate $PKG/etc/logrotate.d/glusterfs.new diff --git a/network/glusterfs/glusterfs.info b/network/glusterfs/glusterfs.info index ccd7764471..49d1257100 100644 --- a/network/glusterfs/glusterfs.info +++ b/network/glusterfs/glusterfs.info @@ -1,8 +1,8 @@ PRGNAM="glusterfs" -VERSION="4.1.0" +VERSION="11.1" HOMEPAGE="https://www.gluster.org/" -DOWNLOAD="https://download.gluster.org/pub/gluster/glusterfs/01.old-releases/4.1/4.1.0/glusterfs-4.1.0.tar.gz" -MD5SUM="2b9cd00fb6a1eff2f84489b7883303b7" +DOWNLOAD="https://download.gluster.org/pub/gluster/glusterfs/11/11.1/glusterfs-11.1.tar.gz" +MD5SUM="7e290a50026752f435f694651687e0f2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="liburcu" diff --git a/network/insync/insync.SlackBuild b/network/insync/insync.SlackBuild index 095a34145f..fa3d027b30 100644 --- a/network/insync/insync.SlackBuild +++ b/network/insync/insync.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=insync DEBNAM=xenial -VERSION=${VERSION:-3.3.9.40955} +VERSION=${VERSION:-3.9.0.60000} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/insync/insync.info b/network/insync/insync.info index b6e0dbcf74..a0711e83d1 100644 --- a/network/insync/insync.info +++ b/network/insync/insync.info @@ -1,10 +1,10 @@ PRGNAM="insync" -VERSION="3.3.9.40955" +VERSION="3.9.0.60000" HOMEPAGE="https://www.insynchq.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://slackware.uk/sbosrcarch/by-name/network/insync/insync_3.3.9.40955-xenial_amd64.deb" -MD5SUM_x86_64="fd8ea3caaea11d4583e3a3f53876ac95" +DOWNLOAD_x86_64="https://cdn.insynchq.com/builds/linux/3.9.0.60000/insync_3.9.0.60000-noble_amd64.deb" +MD5SUM_x86_64="58aa02575a3579f1ce316328402712e3" REQUIRES="" MAINTAINER="Pedro R.M. Júnior" EMAIL="pedrormjunior@gmail.com" diff --git a/network/lurch/lurch.SlackBuild b/network/lurch/lurch.SlackBuild index 38d63c172c..365ac3f398 100644 --- a/network/lurch/lurch.SlackBuild +++ b/network/lurch/lurch.SlackBuild @@ -72,6 +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 {} + +export CMAKE_POLICY_VERSION_MINIMUM=3.5 CFLAGS="$SLKCFLAGS" make make install DESTDIR=$PKG diff --git a/network/mdk4/mdk4.SlackBuild b/network/mdk4/mdk4.SlackBuild index f3e3c5b046..bb5c54b302 100644 --- a/network/mdk4/mdk4.SlackBuild +++ b/network/mdk4/mdk4.SlackBuild @@ -62,6 +62,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + sed -i \ -e 's/^\(PREFIX\s\+=\s\+\).\+$/\1\/usr/' \ -e 's/^\(MANDIR\s\+=\s\+\$(PREFIX)\/\).\+$/\1man/' \ diff --git a/network/mdk4/patches/01_manpage_example.patch b/network/mdk4/patches/01_manpage_example.patch new file mode 100644 index 0000000000..5f7ce3b2d7 --- /dev/null +++ b/network/mdk4/patches/01_manpage_example.patch @@ -0,0 +1,22 @@ +From: Samuel Henrique +Date: Mon, 22 Apr 2024 08:15:14 +0700 +Subject: Point to example file in --help output + +=================================================================== +--- + man/mdk4.2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/mdk4.2 b/man/mdk4.2 +index dbd51c6..f5ce41f 100644 +--- a/man/mdk4.2 ++++ b/man/mdk4.2 +@@ -46,7 +46,7 @@ Use also non-printable caracters in generated SSIDs and create SSIDs that break + Read SSIDs from file + .TP + .BI -v " " +-Read MACs and SSIDs from file. See example file! ++Read MACs and SSIDs from file. See example file at /usr/share/doc/mdk4/fakeap-example.txt + .TP + .BI -t " " + -t 1 = Create only Ad-Hoc network diff --git a/network/mdk4/patches/02_makefile_osdep_parallel_build_fix.patch b/network/mdk4/patches/02_makefile_osdep_parallel_build_fix.patch new file mode 100644 index 0000000000..986ed23193 --- /dev/null +++ b/network/mdk4/patches/02_makefile_osdep_parallel_build_fix.patch @@ -0,0 +1,23 @@ +From: Debian Security Tools +Date: Mon, 22 Apr 2024 08:15:14 +0700 +Subject: makefile_osdep_parallel_build_fix + +Origin: upstream, https://github.com/aircrack-ng/mdk4/commit/a214f5cedc0e27060d10a359a1efeaed7d4ab2a3 +--- + src/Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 6ee36bc..1540755 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -27,8 +27,7 @@ att: + osd: + $(MAKE) -C $(OSD) + +-$(LIBOSD) $(OSD)/libosdep.a: +- $(MAKE) -C $(OSD) ++$(LIBOSD) $(OSD)/libosdep.a: osd + + $(OBJ_ATT): + $(MAKE) -C $(ATTACKS) diff --git a/network/mdk4/patches/03_fix-x-mode-bug.patch b/network/mdk4/patches/03_fix-x-mode-bug.patch new file mode 100644 index 0000000000..eb1160c13b --- /dev/null +++ b/network/mdk4/patches/03_fix-x-mode-bug.patch @@ -0,0 +1,70 @@ +From: E7mer +Date: Fri, 15 Oct 2021 10:34:47 +0800 +Subject: fix x mode bug + +Origin: upstream, https://github.com/aircrack-ng/mdk4/commit/9e595b2f72b9c6cf12cc688e46e3eba3bac1b4d3 +--- + src/attacks/poc.c | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/src/attacks/poc.c b/src/attacks/poc.c +index a2ff199..7547b1c 100644 +--- a/src/attacks/poc.c ++++ b/src/attacks/poc.c +@@ -53,6 +53,7 @@ void* poc_parse(int argc, char *argv[]) { + struct dirent *ptr; + int file_cnt; + int file_lines; ++ char poc_path[256]; + char file_name[255]; + unsigned char buf[8192]; + FILE *fp1; +@@ -96,13 +97,16 @@ void* poc_parse(int argc, char *argv[]) { + return NULL; + } + } +- // load PoC packets +- if ((dir=opendir("./pocs")) == NULL) +- { +- if(dir=opendir("/usr/local/src/mdk4/pocs")==NULL){ ++ // load PoC packets ++ strcpy(poc_path, "./pocs"); ++ dir=opendir(poc_path); ++ if (dir == NULL){ ++ strcpy(poc_path, "/usr/local/src/mdk4/pocs"); ++ dir=opendir(poc_path); ++ if(dir == NULL){ + printf("Open pocs dir error!\n"); + exit(1); +- } ++ } + } + + file_cnt = 0; +@@ -115,7 +119,6 @@ void* poc_parse(int argc, char *argv[]) { + { + file_cnt++; + } +- + } + closedir(dir); + +@@ -132,7 +135,7 @@ void* poc_parse(int argc, char *argv[]) { + memset(poc_pkts, 0, sizeof(struct poc_packet) * file_cnt); + + i=0; +- dir=opendir("./pocs"); ++ dir=opendir(poc_path); + while((ptr=readdir(dir)) != NULL) + { + if(strcmp(ptr->d_name, ".") == 0 || strcmp(ptr->d_name, "..") == 0) +@@ -141,7 +144,8 @@ void* poc_parse(int argc, char *argv[]) { + if(ptr->d_type == 8) // file + { + memset(file_name, 0, sizeof(file_name)); +- strcpy(file_name, "./pocs/"); ++ strcpy(file_name, poc_path); ++ strcat(file_name, "/"); + strcat(file_name, ptr->d_name); + strncpy(poc_pkts[i].vendor, ptr->d_name, sizeof(poc_pkts[i].vendor)); + diff --git a/network/mdk4/patches/04_Declare-functions-before-using-it.patch b/network/mdk4/patches/04_Declare-functions-before-using-it.patch new file mode 100644 index 0000000000..109839430b --- /dev/null +++ b/network/mdk4/patches/04_Declare-functions-before-using-it.patch @@ -0,0 +1,109 @@ +From: Arnaud Rebillout +Date: Mon, 22 Apr 2024 08:16:40 +0700 +Subject: Declare functions before using it +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Lately Debian enabled -Werror=implicit-function-declaration, causing the +build to break in a few places. Fix it by declaring functions before +using it, or including the right libraries. + +Errors that this commit fixes are: + +``` +probing.c:236:3: error: implicit declaration of function ‘add_ssid_set’ [-Werror=implicit-function-declaration] +probing.c:237:3: error: implicit declaration of function ‘add_rate_sets’ [-Werror=implicit-function-declaration] +poc.c:152:30: error: implicit declaration of function ‘get_file_lines’ [-Werror=implicit-function-declaration] +poc.c:169:59: error: implicit declaration of function ‘str_to_hex’ [-Werror=implicit-function-declaration] +poc.c:522:30: error: implicit declaration of function ‘toupper’ [-Werror=implicit-function-declaration] +test.c:164:3: error: implicit declaration of function ‘load_greylist’; did you mean ‘test_greylist’? [-Werror=implicit-function-declaration] +``` + +Forwarded: https://github.com/aircrack-ng/mdk4/pull/117 +--- + src/attacks/poc.c | 4 ++++ + src/greylist.c | 9 +-------- + src/greylist.h | 9 +++++++++ + src/packet.h | 3 +++ + 4 files changed, 17 insertions(+), 8 deletions(-) + +diff --git a/src/attacks/poc.c b/src/attacks/poc.c +index 7547b1c..bf21429 100644 +--- a/src/attacks/poc.c ++++ b/src/attacks/poc.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + #include "poc.h" + +@@ -17,6 +18,9 @@ + struct poc_packet *poc_pkts = NULL; + int vendor_cnt = 0; + ++int get_file_lines(char * filename); ++int str_to_hex(unsigned char *pascii, unsigned char *phex, unsigned int len); ++ + void poc_shorthelp() + { + printf(" Proof-of-concept of WiFi protocol implementation vulnerability,\n"); +diff --git a/src/greylist.c b/src/greylist.c +index ad9f26d..da8f8c9 100644 +--- a/src/greylist.c ++++ b/src/greylist.c +@@ -10,13 +10,6 @@ struct greylist { + struct greylist *next; + }; + +-typedef enum +-{ +- BLACK_LIST, +- WHITE_LIST, +- +-}list_type; +- + struct greylist *glist = NULL; + struct greylist *blist = NULL; + struct greylist *wlist = NULL; +@@ -58,7 +51,7 @@ struct greylist *search_in_greylist(struct ether_addr mac, struct greylist *gl) + return NULL; + } + +-void load_greylist(list_type type, char *filename) { ++void load_greylist(greylist_type type, char *filename) { + char *entry; + + if (filename) { +diff --git a/src/greylist.h b/src/greylist.h +index f1d3d1a..b34eb60 100644 +--- a/src/greylist.h ++++ b/src/greylist.h +@@ -14,4 +14,13 @@ char is_blacklisted(struct ether_addr mac); + + char is_whitelisted(struct ether_addr mac); + ++typedef enum ++{ ++ BLACK_LIST, ++ WHITE_LIST, ++ ++}greylist_type; ++ ++void load_greylist(greylist_type type, char *filename); ++ + #endif +diff --git a/src/packet.h b/src/packet.h +index 208c84a..b459ae6 100644 +--- a/src/packet.h ++++ b/src/packet.h +@@ -266,4 +266,7 @@ void set_seqno(struct packet *pkt, uint16_t seqno); + uint8_t get_fragno(struct packet *pkt); + void set_fragno(struct packet *pkt, uint8_t frag, int last_frag); + ++void add_ssid_set(struct packet *pkt, char *ssid); ++void add_rate_sets(struct packet *pkt, char b_rates, char g_rates); ++ + #endif diff --git a/network/mdk4/patches/05_ftbfs-with-gcc-14.patch b/network/mdk4/patches/05_ftbfs-with-gcc-14.patch new file mode 100644 index 0000000000..1625570bae --- /dev/null +++ b/network/mdk4/patches/05_ftbfs-with-gcc-14.patch @@ -0,0 +1,34 @@ +Description: Fixes two errors causing FTBFS with gcc-14 + channelhopper.c:48:26: error: initialization of 'pthread_t' + {aka 'long unsigned int'} from 'void *' makes integer from pointer without + a cast [-Wint-conversion] + . + poc.c:516:17: error: 'return' with no value, in function returning non-void + [-Wreturn-mismatch] + . + Backporting some changes applied upstream (Closes: #1081054). +Origin: backport, https://github.com/aircrack-ng/mdk4/commit/36ca143a2e6c0b75b5ec60143b0c5eddd3d2970c +Author: Sven Geuer +Last-Update: 2024-10-04 +--- a/src/channelhopper.c ++++ b/src/channelhopper.c +@@ -45,7 +45,7 @@ + int chans_out [MAX_CHAN_COUNT] = {0}; + + pthread_t *hopper = NULL; +-pthread_t chan_sniffer = NULL; ++pthread_t chan_sniffer = (int)NULL; + int hopper_useconds = 0; + volatile int sniff = 0; + pthread_mutex_t chan_thread_mutex; +--- a/src/attacks/poc.c ++++ b/src/attacks/poc.c +@@ -513,7 +513,7 @@ + unsigned char s1, s2; + + if(pascii == NULL || phex == NULL || len == 0) +- return; ++ return (int)NULL; + + str_len = strlen(pascii)/4; + if(str_len) diff --git a/network/memcached/memcached.SlackBuild b/network/memcached/memcached.SlackBuild index 95bdb8ed75..533afa9bb4 100644 --- a/network/memcached/memcached.SlackBuild +++ b/network/memcached/memcached.SlackBuild @@ -92,7 +92,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=array-bounds" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/mosh/1282.patch b/network/mosh/1282.patch deleted file mode 100644 index c8376a2c12..0000000000 --- a/network/mosh/1282.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8012ca9c8d16f99679c171b36ad02655549ab7ff Mon Sep 17 00:00:00 2001 -From: Alex Chernyakhovsky -Date: Sun, 30 Jul 2023 16:19:46 -0400 -Subject: [PATCH] Bump C++ version to C++17 - -Protobuf versions since 3.6.0 have long had a C++11 dependency; even -more recent versions have picked up an Abseil dependency bumping that -to C++14. Since it is now 2023, defaulting to C++17 is reasonable, so -remove the conditional C++ standards version check that mosh -previously had and replace it with an unconditional C++17 check. - -This means that all future commits can use C++17 features. According -to https://en.cppreference.com/w/cpp/compiler_support/17 this means -that minimum effective compiler versions for mosh become: - -gcc 7 (May 2017) -clang 5 (September 2017) - -This, in turn, implies that future versions of mosh will no longer be -available for RHEL/CentOS 7 (June 2014). - -Closes: #1267 ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ee70c7b86..7f7dc3bc2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,9 +22,9 @@ AS_IF([test x"$PROTOC" = x], - # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - --# Protobuf 3.6+ requires C++11. --AS_IF([pkg-config --atleast-version 3.6.0 protobuf], -- [AX_CXX_COMPILE_STDCXX([11])]) -+# Protobuf transitively requires at least C++14, get ahead of the -+# curve and require at least C++17. -+AX_CXX_COMPILE_STDCXX([17]) - - WARNING_CXXFLAGS="" - PICKY_CXXFLAGS="" diff --git a/network/mosh/README b/network/mosh/README deleted file mode 100644 index 8b1944f8d5..0000000000 --- a/network/mosh/README +++ /dev/null @@ -1,18 +0,0 @@ -mosh (MObile SHell server and client) - -Mosh is a remote terminal application that allows roaming, supports -intermittent connectivity, and provides intelligent local echo and -line editing of user keystrokes. - -Mosh attempts to improve on SSH by being more robust and responsive, -especially over Wi-Fi, cellular, and long-distance links. - -The mosh client must be run with a UTF-8 locale. Locales -can be configured system-wide in /etc/profile.d/lang.sh or -/etc/profile.d/lang.csh - -Alternatively set LANG to a UTF-8 locale (e.g. LANG=en_GB.UTF-8) -somewhere else you consider suitable. - -Additionally the server that you are connecting to must have the same -locale installed (though it need not be set as the default). diff --git a/network/mosh/mosh.SlackBuild b/network/mosh/mosh.SlackBuild deleted file mode 100644 index 8127e0ff4d..0000000000 --- a/network/mosh/mosh.SlackBuild +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -# Slackware build script for mosh - -# Written by ruario -# Formerly maintained by Donald Cooley, South Haven, Indiana, USA -# Now maintained by B. Watson . -# Original script had no license; modified version licensed under -# the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -# 20230225 bkw: homepage/download changed. - -# 20220425 bkw: BUILD=2 -# - take over maintenance. -# - relicense script as WTFPL. -# - include a couple more doc files (THANKS and ocb-license.html). -# - add bash completion to package. -# - add ufw integration to package (untested; I don't run ufw). - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=mosh -VERSION=${VERSION:-1.4.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -# patch to work with newer protobuf3 -patch -p1 < $CWD/1282.patch - -autoreconf -vif -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -fpermissive" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG -gzip -9 $PKG/usr/man/man*/* - -install -D -m0644 \ - conf/bash-completion/completions/$PRGNAM \ - $PKG/usr/share/bash-completion/completions/$PRGNAM - -install -D -m0644 \ - conf/ufw/applications.d/$PRGNAM \ - $PKG/etc/ufw/applications.d/$PRGNAM - -PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKGDOC -cp -a AUTHORS COPYING ChangeLog NEWS *.md *.html THANKS $PKGDOC -cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/mosh/mosh.info b/network/mosh/mosh.info deleted file mode 100644 index abec8c93be..0000000000 --- a/network/mosh/mosh.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mosh" -VERSION="1.4.0" -HOMEPAGE="https://mosh.org" -DOWNLOAD="https://github.com/mobile-shell/mosh/releases/download/mosh-1.4.0/mosh-1.4.0.tar.gz" -MD5SUM="c34a647f8545565d79188acacaea7559" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="perl-IO-Tty protobuf3" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/network/mosh/slack-desc b/network/mosh/slack-desc deleted file mode 100644 index 077b45efd6..0000000000 --- a/network/mosh/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -mosh: mosh (MObile SHell server and client) -mosh: -mosh: Remote terminal application that allows roaming, supports intermittent -mosh: connectivity, and provides intelligent local echo and line editing of -mosh: user keystrokes. -mosh: -mosh: Mosh attempts to improve on SSH by being more robust and responsive, -mosh: especially over Wi-Fi, cellular, and long-distance links. -mosh: -mosh: http://mosh.mit.edu/ -mosh: diff --git a/network/mumble-server/mumble-server.SlackBuild b/network/mumble-server/mumble-server.SlackBuild index c46e5c0089..bd75a04a85 100644 --- a/network/mumble-server/mumble-server.SlackBuild +++ b/network/mumble-server/mumble-server.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mumble-server SRCNAM=mumble -VERSION=${VERSION:-1.5.634} +VERSION=${VERSION:-1.5.735} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -104,16 +104,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -sed -e "s|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|" -i CMakeLists.txt mkdir -p build - -(cd build +cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_C_STANDARD=99 \ + -W no-dev \ -Dclient=OFF \ -Dserver=ON \ -Dwarnings-as-errors=OFF \ @@ -122,7 +123,7 @@ cmake \ make make install DESTDIR=$PKG -) +cd .. mkdir -p \ $PKG/etc/{logrotate.d,rc.d} \ diff --git a/network/mumble-server/mumble-server.info b/network/mumble-server/mumble-server.info index 2db8ef54a3..f73242d501 100644 --- a/network/mumble-server/mumble-server.info +++ b/network/mumble-server/mumble-server.info @@ -1,8 +1,8 @@ PRGNAM="mumble-server" -VERSION="1.5.634" +VERSION="1.5.735" HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page" -DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.5.634/mumble-1.5.634.tar.gz" -MD5SUM="093f389af4512e5e42e1a431b02aacfc" +DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.5.735/mumble-1.5.735.tar.gz" +MD5SUM="e13c7713fead11ca3e805074e7382b98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="protobuf3" diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild index 145545222c..b16262f939 100644 --- a/network/mumble/mumble.SlackBuild +++ b/network/mumble/mumble.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mumble -VERSION=${VERSION:-1.5.634} +VERSION=${VERSION:-1.5.735} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -117,7 +117,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sed -e "s|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|" -i CMakeLists.txt mkdir -p build cd build @@ -127,6 +126,10 @@ cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_C_STANDARD=99 \ + -Dwarnings-as-errors=OFF \ + -W no-dev \ -Dclient=ON \ -Dserver=OFF \ -Dbundled-opus=OFF \ diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info index 5c66d0e051..fbff6237e6 100644 --- a/network/mumble/mumble.info +++ b/network/mumble/mumble.info @@ -1,8 +1,8 @@ PRGNAM="mumble" -VERSION="1.5.634" +VERSION="1.5.735" HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page" -DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.5.634/mumble-1.5.634.tar.gz" -MD5SUM="093f389af4512e5e42e1a431b02aacfc" +DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.5.735/mumble-1.5.735.tar.gz" +MD5SUM="e13c7713fead11ca3e805074e7382b98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="protobuf3 poco" diff --git a/network/ngrep/ngrep-1.47-regex.patch b/network/ngrep/ngrep-1.47-regex.patch new file mode 100644 index 0000000000..613643cf0e --- /dev/null +++ b/network/ngrep/ngrep-1.47-regex.patch @@ -0,0 +1,29 @@ +--- a/configure.in ++++ b/configure.in +@@ -6,6 +6,7 @@ + dnl NOTE: configure.in requires autoconf 2.57 or more recent. + + AC_INIT(ngrep.c) ++AC_CONFIG_SUBDIRS([regex-0.12]) + + AC_MSG_RESULT + AC_MSG_RESULT(Configuring System ...) +--- a/regex-0.12/Makefile.in ++++ b/regex-0.12/Makefile.in +@@ -26,13 +26,13 @@ + # -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to + # the corresponding C procedures). If not -DDEBUG, the macros + # are used. +-CPPFLAGS = ++CPPFLAGS ?= + + # Likewise, you can override CFLAGS to optimize, use -Wall, etc. +-CFLAGS = -g ++CFLAGS ?= -g + + # Ditto for LDFLAGS and LOADLIBES. +-LDFLAGS = ++LDFLAGS ?= + LOADLIBES = + + srcdir = @srcdir@ diff --git a/network/ngrep/ngrep.SlackBuild b/network/ngrep/ngrep.SlackBuild index 84422910d0..6647585261 100644 --- a/network/ngrep/ngrep.SlackBuild +++ b/network/ngrep/ngrep.SlackBuild @@ -82,6 +82,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/ngrep-1.47-regex.patch +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/offlineimap/offlineimap.info b/network/offlineimap/offlineimap.info index 6aabd7cdaa..7153df9c5c 100644 --- a/network/offlineimap/offlineimap.info +++ b/network/offlineimap/offlineimap.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/OfflineIMAP/offlineimap/archive/v7.3.4/offlineimap- MD5SUM="4494e696fc20a49db4e4a90f252df2c4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="rfc6555" +REQUIRES="rfc6555 python2-six" MAINTAINER="Nishant Limbachia" EMAIL="nishant@mnspace.net" diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild index 7100e30948..434e0669a5 100644 --- a/network/remmina/remmina.SlackBuild +++ b/network/remmina/remmina.SlackBuild @@ -28,12 +28,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=remmina -VERSION=${VERSION:-1.4.33} +VERSION=${VERSION:-1.4.35} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -DIRNAME=Remmina-v.$VERSION +DIRNAME=Remmina-v$VERSION AVAHI=${AVAHI:-OFF} KWALLET=${KWALLET:-ON} diff --git a/network/remmina/remmina.info b/network/remmina/remmina.info index 8fa24fb064..b6d1d69545 100644 --- a/network/remmina/remmina.info +++ b/network/remmina/remmina.info @@ -1,8 +1,8 @@ PRGNAM="remmina" -VERSION="1.4.33" +VERSION="1.4.35" HOMEPAGE="https://www.remmina.org" -DOWNLOAD="https://gitlab.com/Remmina/Remmina/-/archive/v.1.4.33/Remmina-v.1.4.33.tar.bz2" -MD5SUM="e3f0be9198e826938223c0e0ef402837" +DOWNLOAD="https://gitlab.com/Remmina/Remmina/-/archive/v1.4.35/Remmina-v1.4.35.tar.bz2" +MD5SUM="f655881007cc55db30518b9bfcae5ec4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="spice-gtk" diff --git a/network/sqlmap/sqlmap.SlackBuild b/network/sqlmap/sqlmap.SlackBuild index 20dc25a8ae..20d7cd4ff9 100644 --- a/network/sqlmap/sqlmap.SlackBuild +++ b/network/sqlmap/sqlmap.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sqlmap -VERSION=${VERSION:-1.4.9} +VERSION=${VERSION:-1.8.7} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/sqlmap/sqlmap.info b/network/sqlmap/sqlmap.info index 2d9ff51976..c271d6be43 100644 --- a/network/sqlmap/sqlmap.info +++ b/network/sqlmap/sqlmap.info @@ -1,8 +1,8 @@ PRGNAM="sqlmap" -VERSION="1.4.9" +VERSION="1.8.7" HOMEPAGE="http://sqlmap.org/" -DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/1.4.9/sqlmap-1.4.9.tar.gz" -MD5SUM="f79dac9b60f40ccdb4e1a05797b7cdc6" +DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/1.8.7/sqlmap-1.8.7.tar.gz" +MD5SUM="874be44facc1e375a61812512c4e2422" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/ssmtp/ssmtp.SlackBuild b/network/ssmtp/ssmtp.SlackBuild index d75306bc87..2ce405bd48 100644 --- a/network/ssmtp/ssmtp.SlackBuild +++ b/network/ssmtp/ssmtp.SlackBuild @@ -91,6 +91,8 @@ for i in $CWD/patches/*.patch; do patch -p1 < $i done +autoreconf -vif + LIBS="-lcrypto" \ CFLAGS="$SLKCFLAGS -Wl,-s" \ ./configure \ diff --git a/network/sylpheed/sylpheed-3.7.0-types.patch b/network/sylpheed/sylpheed-3.7.0-types.patch new file mode 100644 index 0000000000..4270793b34 --- /dev/null +++ b/network/sylpheed/sylpheed-3.7.0-types.patch @@ -0,0 +1,201 @@ +From 1bff4a0727c3e9e33418965205b127b956e7717e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 27 Jan 2024 13:30:59 +0100 +Subject: [PATCH 1/4] fix incompatible pointer warnings + +--- + libsylph/utils.c | 8 ++++---- + libsylph/utils.h | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libsylph/utils.c b/libsylph/utils.c +index aabce066..7a9d1b61 100644 +--- a/libsylph/utils.c ++++ b/libsylph/utils.c +@@ -4047,7 +4047,7 @@ static gchar **argv_utf8_to_locale(gchar **argv) + } + #endif + +-gint execute_async(gchar *const argv[]) ++gint execute_async(gchar * argv[]) + { + #if defined(G_OS_WIN32) && !GLIB_CHECK_VERSION(2, 8, 2) + gchar **cp_argv; +@@ -4077,7 +4077,7 @@ gint execute_async(gchar *const argv[]) + return 0; + } + +-gint execute_sync(gchar *const argv[]) ++gint execute_sync(gchar * argv[]) + { + gint status; + #if defined(G_OS_WIN32) && !GLIB_CHECK_VERSION(2, 8, 2) +@@ -4247,7 +4247,7 @@ gint execute_open_file(const gchar *file, const gchar *content_type) + return 0; + } + #elif defined(__APPLE__) +- const gchar *argv[3] = {"open", NULL, NULL}; ++ gchar *argv[3] = {"open", NULL, NULL}; + + g_return_val_if_fail(file != NULL, -1); + +@@ -4256,7 +4256,7 @@ gint execute_open_file(const gchar *file, const gchar *content_type) + argv[1] = file; + execute_async(argv); + #else +- const gchar *argv[3] = {"xdg-open", NULL, NULL}; ++ gchar *argv[3] = {"xdg-open", NULL, NULL}; + + g_return_val_if_fail(file != NULL, -1); + +diff --git a/libsylph/utils.h b/libsylph/utils.h +index 9ac65cf4..97496049 100644 +--- a/libsylph/utils.h ++++ b/libsylph/utils.h +@@ -513,8 +513,8 @@ gchar *file_read_to_str (const gchar *file); + gchar *file_read_stream_to_str (FILE *fp); + + /* process execution */ +-gint execute_async (gchar *const argv[]); +-gint execute_sync (gchar *const argv[]); ++gint execute_async (gchar * argv[]); ++gint execute_sync (gchar * argv[]); + gint execute_command_line (const gchar *cmdline, + gboolean async); + gint execute_command_line_async_wait +-- +2.43.0 + + +From 1ae0b7e973e5da02190cfd5aeb145e6604af1e37 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 27 Jan 2024 13:31:38 +0100 +Subject: [PATCH 2/4] fix pointer to int cast + +--- + libsylph/account.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsylph/account.c b/libsylph/account.c +index 2431bf3d..7067af3d 100644 +--- a/libsylph/account.c ++++ b/libsylph/account.c +@@ -276,7 +276,7 @@ gboolean account_address_exist(const gchar *address) + } + } + +- return (gboolean)g_hash_table_lookup(address_table, address); ++ return g_hash_table_lookup(address_table, address) != NULL; + } + + void account_foreach(AccountFunc func, gpointer user_data) +-- +2.43.0 + + +From 5427f4108a08c32869af0a3b56f13cb8a545fc7f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 27 Jan 2024 13:32:13 +0100 +Subject: [PATCH 3/4] fix format for size_t argument + +--- + libsylph/codeconv.c | 2 +- + libsylph/procmime.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libsylph/codeconv.c b/libsylph/codeconv.c +index 49d1b3d3..6cad90d5 100644 +--- a/libsylph/codeconv.c ++++ b/libsylph/codeconv.c +@@ -2722,7 +2722,7 @@ CharSet conv_check_file_encoding(const gchar *file) + if ((size = fread(buf, 2, BUFFSIZE / 2, fp)) > 0) { + CharSet guess_enc = C_AUTO; + +- debug_print("conv_check_file_encoding: check first %d bytes of file %s\n", size * 2, file); ++ debug_print("conv_check_file_encoding: check first %zd bytes of file %s\n", size * 2, file); + + /* BOM check */ + if ((buf[0] & 0xff) == 0xfe && (buf[1] & 0xff) == 0xff) { +diff --git a/libsylph/procmime.c b/libsylph/procmime.c +index 4c3a90c6..0c101920 100644 +--- a/libsylph/procmime.c ++++ b/libsylph/procmime.c +@@ -1890,7 +1890,7 @@ EncodingType procmime_get_encoding_for_text_file(const gchar *file) + octet_percentage = 0.0; + + debug_print("procmime_get_encoding_for_text_file(): " +- "8bit chars: %d / %d (%f%%)\n", octet_chars, total_len, ++ "8bit chars: %zd / %zd (%f%%)\n", octet_chars, total_len, + 100.0 * octet_percentage); + + if (octet_percentage > 0.20) { +@@ -1926,7 +1926,7 @@ EncodingType procmime_get_encoding_for_str(const gchar *str) + octet_percentage = 0.0; + + debug_print("procmime_get_encoding_for_str(): " +- "8bit chars: %d / %d (%f%%)\n", octet_chars, total_len, ++ "8bit chars: %zd / %zd (%f%%)\n", octet_chars, total_len, + 100.0 * octet_percentage); + + if (octet_percentage > 0.20) { +-- +2.43.0 + + +From 7aba8dcfe69ed08b3484464d8424ef16220d792c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 27 Jan 2024 14:26:33 +0100 +Subject: [PATCH 4/4] fix format for glib types + +--- + libsylph/filter.c | 4 ++-- + libsylph/folder.c | 2 +- + libsylph/pop.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libsylph/filter.c b/libsylph/filter.c +index c58f8fc9..9607ccfb 100644 +--- a/libsylph/filter.c ++++ b/libsylph/filter.c +@@ -566,10 +566,10 @@ static gboolean filter_match_cond(FilterCond *cond, MsgInfo *msginfo, + debug_print("filter-log: %s: CMD_TEST, str_value: [%s]%s\n", G_STRFUNC, sv, nm); + break; + case FLT_COND_SIZE_GREATER: +- debug_print("filter-log: %s: SIZE_GREATER: %u %s %d (KB)%s\n", G_STRFUNC, msginfo->size, not_match ? "<=" : ">", cond->int_value, nm); ++ debug_print("filter-log: %s: SIZE_GREATER: %" G_GSIZE_FORMAT " %s %d (KB)%s\n", G_STRFUNC, msginfo->size, not_match ? "<=" : ">", cond->int_value, nm); + break; + case FLT_COND_AGE_GREATER: +- debug_print("filter-log: %s: AGE_GREATER: %lld (sec) %s %d (day)%s\n", G_STRFUNC, timediff, not_match ? "<=" : ">", cond->int_value, nm); ++ debug_print("filter-log: %s: AGE_GREATER: %" G_GINT64_FORMAT " (sec) %s %d (day)%s\n", G_STRFUNC, timediff, not_match ? "<=" : ">", cond->int_value, nm); + break; + case FLT_COND_UNREAD: + debug_print("filter-log: %s: UNREAD%s\n", G_STRFUNC, nm); +diff --git a/libsylph/folder.c b/libsylph/folder.c +index 6fffe2dc..c1487e11 100644 +--- a/libsylph/folder.c ++++ b/libsylph/folder.c +@@ -1945,7 +1945,7 @@ static void folder_write_list_recursive(GNode *node, gpointer data) + } + + fprintf(fp, +- " mtime=\"%lld\" new=\"%d\" unread=\"%d\" total=\"%d\"", ++ " mtime=\"%" G_GINT64_FORMAT "\" new=\"%d\" unread=\"%d\" total=\"%d\"", + (gint64)item->mtime, item->new, item->unread, item->total); + + if (item->account) +diff --git a/libsylph/pop.c b/libsylph/pop.c +index 8cb7f5cb..7108b7a6 100644 +--- a/libsylph/pop.c ++++ b/libsylph/pop.c +@@ -195,7 +195,7 @@ gint pop3_getrange_stat_send(Pop3Session *session) + + gint pop3_getrange_stat_recv(Pop3Session *session, const gchar *msg) + { +- if (sscanf(msg, "%d %lld", &session->count, &session->total_bytes) != 2) { ++ if (sscanf(msg, "%d %" G_GINT64_FORMAT "", &session->count, &session->total_bytes) != 2) { + log_warning(_("POP3 protocol error\n")); + session->error_val = PS_PROTOCOL; + return PS_PROTOCOL; +-- +2.43.0 + diff --git a/network/sylpheed/sylpheed.SlackBuild b/network/sylpheed/sylpheed.SlackBuild index eb0b55c8cd..2af1e2c004 100644 --- a/network/sylpheed/sylpheed.SlackBuild +++ b/network/sylpheed/sylpheed.SlackBuild @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -84,11 +81,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/sylpheed-3.7.0-types.patch + # Thanks to archlinux! sed -i 's|enchant/|enchant-2/|g' src/compose.c sed -i 's| enchant| enchant-2|g' configure -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu17" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/network/tokodon/README b/network/tokodon/README deleted file mode 100644 index d84bd1b3a3..0000000000 --- a/network/tokodon/README +++ /dev/null @@ -1,8 +0,0 @@ -tokodon (Mastodon client for Plasma and Plasma Mobile) - -A modern client for Mastodon and other decentralized servers that -implement its API (such as Pixelfed). - -NOTE: This is the latest supported version for Slackware 15.0 unless -libraries/kirigami-addons can be updated, which requires Plasma -Framework in Slackware to be updated to 5.91 or higher. diff --git a/network/tokodon/doinst.sh b/network/tokodon/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/network/tokodon/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/network/tokodon/slack-desc b/network/tokodon/slack-desc deleted file mode 100644 index 18a81c984d..0000000000 --- a/network/tokodon/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -tokodon: tokodon (Mastodon client for Plasma and Plasma Mobile) -tokodon: -tokodon: A modern client for Mastodon and other decentralized servers that -tokodon: implement its API (such as Pixelfed). -tokodon: -tokodon: HOMEPAGE: https://github.com/KDE/tokodon -tokodon: -tokodon: -tokodon: -tokodon: -tokodon: diff --git a/network/tokodon/tokodon.SlackBuild b/network/tokodon/tokodon.SlackBuild deleted file mode 100644 index 4de5ded079..0000000000 --- a/network/tokodon/tokodon.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash - -# Slackware build script for tokodon - -# Copyright 2023 Jeremy Hansen -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=tokodon -VERSION=${VERSION:-22.09} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# -sed -i 's|KWindowSystem::updateStartupId(view);|view->show();|' src/main.cpp -sed -i 's|KWindowSystem::activateWindow(view)|view->raise();|' src/main.cpp - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDE_INSTALL_LIBDIR=${LIBDIRSUFFIX} \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - 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 diff --git a/network/tokodon/tokodon.info b/network/tokodon/tokodon.info deleted file mode 100644 index 036bc82274..0000000000 --- a/network/tokodon/tokodon.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="tokodon" -VERSION="22.09" -HOMEPAGE="https://github.com/KDE/tokodon" -DOWNLOAD="https://github.com/KDE/tokodon/archive/refs/tags/v22.09/tokodon-22.09.tar.gz" -MD5SUM="71c1826bb9a6d0c5f042d46613c1f594" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="kirigami-addons" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/network/transmission/transmission.SlackBuild b/network/transmission/transmission.SlackBuild index 514dcba476..503ca3fd58 100644 --- a/network/transmission/transmission.SlackBuild +++ b/network/transmission/transmission.SlackBuild @@ -171,6 +171,10 @@ cd build -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DCMAKE_BUILD_TYPE=Release .. + + # avoid issues with cmake >= 4 when building dependencies + export CMAKE_POLICY_VERSION_MINIMUM=3.5 + make VERBOSE=1 make install/strip DESTDIR=$PKG cd .. diff --git a/network/urlview/patches/Link-against-libncursesw-setlocale-LC_ALL.patch b/network/urlview/patches/Link-against-libncursesw-setlocale-LC_ALL.patch new file mode 100644 index 0000000000..0c0e4f244f --- /dev/null +++ b/network/urlview/patches/Link-against-libncursesw-setlocale-LC_ALL.patch @@ -0,0 +1,49 @@ +From: nabijaczleweli@nabijaczleweli.xyz +Date: Wed, 17 Aug 2022 22:33:38 +0200 +Subject: Link against libncursesw, setlocale(LC_ALL, "") + +On https://example.com/a” (i.e. a fancy quote), urlview with +narrow-character curses makes an absolute hash of it, by writing it as: + https://example.com/a�~@~] + +When linked against the wide-character ncurses, it displays it exactly +as expected, in the original form. +--- +diff --git a/configure.in b/configure.in +index 45e4e89..7f5be5c 100644 +--- a/configure.in ++++ b/configure.in +@@ -24,10 +24,10 @@ AC_ARG_WITH(slang, [ --with-slang[=DIR] use S-Lang instead of curses], + LIBS="$LIBS -lslang -lm" + fi], + +- [AC_CHECK_LIB(ncurses, initscr, [LIBS="$LIBS -lncurses"], [LIBS="$LIBS -lcurses"]) ++ [AC_CHECK_LIB(ncursesw, initscr, [LIBS="$LIBS -lncursesw"], [LIBS="$LIBS -lcurses"]) + AC_CHECK_FUNCS(curs_set) + AC_CHECK_HEADERS(ncurses.h) +- AC_CHECK_HEADER(ncurses/curses.h, [CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"])]) ++ AC_CHECK_HEADER(ncursesw/curses.h, [CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"])]) + + AC_REPLACE_FUNCS(snprintf) + +diff --git a/urlview.c b/urlview.c +index 7416dfc..b0861bd 100644 +--- a/urlview.c ++++ b/urlview.c +@@ -32,6 +32,7 @@ + #endif /* USE_SLANG */ + + #include ++#include + #include + #include + #include +@@ -146,6 +147,8 @@ void search_backward (char *search, int urlcount, char **url, int *redraw, int * + + int main (int argc, char **argv) + { ++ setlocale(LC_ALL, ""); ++ + struct passwd *pw; + struct stat stat_buf; + #ifndef USE_SLANG diff --git a/network/urlview/patches/invoke-AM_INIT_AUTOMAKE-with-foreign.patch b/network/urlview/patches/invoke-AM_INIT_AUTOMAKE-with-foreign.patch new file mode 100644 index 0000000000..b00b879c8a --- /dev/null +++ b/network/urlview/patches/invoke-AM_INIT_AUTOMAKE-with-foreign.patch @@ -0,0 +1,21 @@ +From: Emanuele Rocca +Date: Thu, 16 Sep 2021 12:33:54 +0200 +Subject: configure.in: invoke AM_INIT_AUTOMAKE with "foreign" + +--- + configure.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index ddd8043..45e4e89 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,5 +1,6 @@ +-AC_INIT(urlview.c) +-AM_INIT_AUTOMAKE(urlview, 0.9) ++AC_INIT([urlview], [0.9]) ++AC_CONFIG_SRCDIR([urlview.c]) ++AM_INIT_AUTOMAKE([foreign]) + dnl AM_CONFIG_HEADER(config.h) + AM_PROG_CC_STDC + CFLAGS="$CFLAGS -DURLVIEW -Dunix" diff --git a/network/urlview/urlview.SlackBuild b/network/urlview/urlview.SlackBuild index c85b2b77c6..324c6243f8 100644 --- a/network/urlview/urlview.SlackBuild +++ b/network/urlview/urlview.SlackBuild @@ -66,6 +66,8 @@ else LIBDIRSUFFIX="" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -80,9 +82,10 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Apply patches for DESTDIR and mostly path fixes: -for i in $CWD/patches/*.diff; do - patch -p0 < $i || exit 1 -done +for i in $CWD/patches/*.diff; do patch -p0 < $i ; done +for i in $CWD/patches/*.patch; do patch -p1 < $i ; done + +autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -96,8 +99,8 @@ 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/man/man1 +gzip -c9 urlview.man > $PKG/usr/man/man1/$PRGNAM.1.gz # Use sample.urlview as system-wide default configuration: install -D -m 0644 sample.urlview $PKG/etc/urlview.conf.new diff --git a/network/vde2/rc.vde2 b/network/vde2/rc.vde2 index 9cc1beceb0..2d648c7a97 100644 --- a/network/vde2/rc.vde2 +++ b/network/vde2/rc.vde2 @@ -33,7 +33,7 @@ start(){ chmod -R a+rwx /var/run/vde.ctl # Apply workaround - echo 1024 > /proc/sys/dev/rtc/max-user-freq + echo 1024 > /sys/class/rtc/rtc0/max_user_freq echo } diff --git a/network/vde2/vde2.SlackBuild b/network/vde2/vde2.SlackBuild index 938256d74c..ff113f6b75 100644 --- a/network/vde2/vde2.SlackBuild +++ b/network/vde2/vde2.SlackBuild @@ -27,8 +27,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vde2 -VERSION=${VERSION:-2.3.2} -BUILD=${BUILD:-2} +SRCNAM=vde-2 +VERSION=${VERSION:-2.3.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -71,9 +69,9 @@ 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/$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 \ @@ -81,9 +79,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 to build against openssl-1.1.x - thanks archlinux! -patch -p1 < $CWD/vde_cryptcab-compile-against-openssl-1.1.0.patch - EXPERIMENTAL=${EXPERIMENTAL:-false} OPTIONS="" @@ -95,7 +90,9 @@ fi # a reminder: # --enable-kernel-switch -CFLAGS="$SLKCFLAGS" \ +autoreconf -vif + +CFLAGS="$SLKCFLAGS -std=gnu17" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/network/vde2/vde2.info b/network/vde2/vde2.info index 51d679f300..884c62a3ff 100644 --- a/network/vde2/vde2.info +++ b/network/vde2/vde2.info @@ -1,8 +1,8 @@ PRGNAM="vde2" -VERSION="2.3.2" +VERSION="2.3.3" HOMEPAGE="http://vde.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/project/vde/vde2/2.3.2/vde2-2.3.2.tar.bz2" -MD5SUM="46fbc5f97f03dc517aa3b2c9d9ea6628" +DOWNLOAD="https://github.com/virtualsquare/vde-2/archive/v2.3.3/vde-2-2.3.3.tar.gz" +MD5SUM="d73411e88975a9f7c9cb4c2b0ad32d15" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch b/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch deleted file mode 100644 index 227312eabb..0000000000 --- a/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/src/vde_cryptcab/cryptcab.c 2011-11-23 16:41:17.000000000 +0000 -+++ b/src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +0000 -@@ -22,7 +22,7 @@ - exit(1); - } - --static EVP_CIPHER_CTX ctx; -+static EVP_CIPHER_CTX *ctx; - static int ctx_initialized = 0; - static int encryption_disabled = 0; - static int nfd; -@@ -30,6 +30,10 @@ - static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700}; - static int verbose = 0; - -+#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x) -+#endif -+ - void vc_printlog(int priority, const char *format, ...) - { - va_list arg; -@@ -103,19 +107,21 @@ - } - - if (!ctx_initialized) { -- EVP_CIPHER_CTX_init (&ctx); -+ ctx = EVP_CIPHER_CTX_new (); -+ if (!ctx) -+ return -1; - ctx_initialized = 1; - } - -- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); -- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1) -+ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); -+ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1) - { - fprintf (stderr,"error in encrypt update\n"); - olen = -1; - goto cleanup; - } - -- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1) -+ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1) - { - fprintf (stderr,"error in encrypt final\n"); - olen = -1; -@@ -124,7 +130,7 @@ - olen += tlen; - - cleanup: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_reset(ctx); - return olen; - } - -@@ -138,19 +144,21 @@ - } - - if (!ctx_initialized) { -- EVP_CIPHER_CTX_init (&ctx); -+ ctx = EVP_CIPHER_CTX_new (); -+ if (!ctx) -+ return -1; - ctx_initialized = 1; - } - -- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); -- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1) -+ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); -+ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1) - { - fprintf (stderr,"error in decrypt update\n"); - olen = -1; - goto cleanup; - } - -- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1) -+ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1) - { - fprintf (stderr,"error in decrypt final\n"); - olen = -1; -@@ -159,7 +167,7 @@ - olen += tlen; - - cleanup: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_reset (ctx); - return olen; - } - diff --git a/network/w3m/w3m.SlackBuild b/network/w3m/w3m.SlackBuild index 022239d2ba..b19dfbb625 100644 --- a/network/w3m/w3m.SlackBuild +++ b/network/w3m/w3m.SlackBuild @@ -82,7 +82,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -[ -n "$NOMOUSE" ] && mouse="--disable-mouse" +# This is disabled an gpm in current, as built, is not compatible +#[ -n "$NOMOUSE" ] && mouse="--disable-mouse" +mouse="--disable-mouse" [ -n "$NOMAILER" ] && mailer="--disable-w3mmailer" [ -n "$GUIBROWSER" ] && browser="--with-browser=$GUIBROWSER" [ -n "$EDITOR" ] && editor="--with-editor=$EDITOR" diff --git a/network/wol/patches/wol-0.7.1-Fix-config.h-test-consumption.patch b/network/wol/patches/wol-0.7.1-Fix-config.h-test-consumption.patch new file mode 100644 index 0000000000..897517a97f --- /dev/null +++ b/network/wol/patches/wol-0.7.1-Fix-config.h-test-consumption.patch @@ -0,0 +1,35 @@ +From 1c16d04a3fc03a5f4c0cd54ff6f207de1062e9bd Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 25 Oct 2022 13:54:04 +0100 +Subject: [PATCH] Fix config.h test consumption + +Bug: https://bugs.gentoo.org/874420 +--- a/lib/ether.h ++++ b/lib/ether.h +@@ -35,7 +35,7 @@ + + #include "magic.h" + +-#if !HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET && !HAVE_STRUCT_ETHER_ADDR_OCTET ++#if !defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) && !defined(HAVE_STRUCT_ETHER_ADDR_OCTET) + + struct + ether_addr +@@ -45,7 +45,7 @@ ether_addr + + #define ETHER_ADDR_OCTET ether_addr_octet + +-#else /* HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET || HAVE_STRUCT_ETHER_ADDR_OCTET */ ++#else /* defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) || defined(HAVE_STRUCT_ETHER_ADDR_OCTET) */ + + #if HAVE_STRUCT_ETHER_ADDR_OCTET + #define ETHER_ADDR_OCTET octet +@@ -55,7 +55,7 @@ ether_addr + #define ETHER_ADDR_OCTET ether_addr_octet + #endif /* HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET */ + +-#endif /* !HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET && !HAVE_STRUCT_ETHER_ADDR_OCTET */ ++#endif /* !defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) && !defined(HAVE_STRUCT_ETHER_ADDR_OCTET) */ + + + #if !defined(HAVE_ETHER_HOSTTON) diff --git a/network/wol/patches/wol-0.7.1-Fix-malloc-detection.patch b/network/wol/patches/wol-0.7.1-Fix-malloc-detection.patch new file mode 100644 index 0000000000..6f783e9cfa --- /dev/null +++ b/network/wol/patches/wol-0.7.1-Fix-malloc-detection.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/874420 + +From bcf98fe9a674a3784ad1a4f8eecc3b31a7b209a9 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 25 Oct 2022 14:00:23 +0100 +Subject: [PATCH] Fix malloc detection + +--- a/m4/getline.m4 ++++ b/m4/getline.m4 +@@ -18,6 +18,7 @@ AC_DEFUN([AM_FUNC_GETLINE], + # include + # include + # include ++# include + int main () + { /* Based on a test program from Karl Heuer. */ + char *line = NULL; +--- a/m4/malloc.m4 ++++ b/m4/malloc.m4 +@@ -14,6 +14,7 @@ AC_DEFUN([jm_FUNC_MALLOC], + + AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc, + [AC_TRY_RUN([ ++ #include + char *malloc (); + int + main () +--- a/m4/realloc.m4 ++++ b/m4/realloc.m4 +@@ -14,7 +14,8 @@ AC_DEFUN([jm_FUNC_REALLOC], + + AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc, + [AC_TRY_RUN([ +- char *realloc (); ++ #include ++ void *realloc(void *ptr, size_t size); + int + main () + { diff --git a/network/wol/patches/wol-0.7.1-linux-headers.patch b/network/wol/patches/wol-0.7.1-linux-headers.patch new file mode 100644 index 0000000000..e381d2a31a --- /dev/null +++ b/network/wol/patches/wol-0.7.1-linux-headers.patch @@ -0,0 +1,11 @@ +--- a/src/magic.c ++++ b/src/magic.c +@@ -142,7 +142,7 @@ magic_assemble (struct magic *magic_buf, const char *mac_str, + } + + for (j = 0; j < MAC_LEN; ++j) +- m[j] = ea.ETHER_ADDR_OCTET[j]; ++ m[j] = ea.ether_addr_octet[j]; + } + + /* accommodate the packet chunk's size to the packet type */ diff --git a/network/wol/wol.SlackBuild b/network/wol/wol.SlackBuild index 0f41e2b836..b0f485364c 100644 --- a/network/wol/wol.SlackBuild +++ b/network/wol/wol.SlackBuild @@ -53,10 +53,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 {} \; + +# Apply patches from gentoo (thanks!) +for i in $CWD/patches/* ; do patch -p1 < $i ; done +autoreconf -vif +export jm_cv_func_working_{re,m}alloc=yes CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -65,18 +70,17 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --infodir=/usr/info \ --build=$ARCH-slackware-linux 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 || exit 1 - 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 rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/*.info* diff --git a/network/wsdd2/README b/network/wsdd2/README deleted file mode 100644 index d164e3196a..0000000000 --- a/network/wsdd2/README +++ /dev/null @@ -1,34 +0,0 @@ -wsdd2 (WSD/LLMNR Discovery/Name Service Daemon) - -Provides samba share discovery for clients who don't support netbios -or are running ip6 (which netbios does not support). -This is based on the NETGEAR implimentation. - -NOTE: make sure you allow local ip6 connections in your samba config -otherwise there will be no shares found. if you use "hosts allow" -in smb.conf then add fc00::/7 fe80::/64 ::1 -to the list of your local ip4 addresses so that local ip6 pcs can -use your shares. - -NOTE2: The following ports/addresses also need to be open if you are -using a firewall: -tcp port 3702 (unicast), and -udp ports 3702 ( multicast on ports 239.255.255.250 / ff02::c ) -tcp port 5355 (unicast), and -udp on ports 224.0.0.252 / ff02::1:3 (multicast) - -to get wsdd2 to run automatically on startup add the following lines -in /etc/rc.d/rc.local - -#start wsdd2 daemon if samba is configured -if [ -x /etc/rc.d/rc.wsdd2 ]; then - /etc/rc.d/rc.wsdd2 start -fi - -and to stop it on shutdown, add the following to -samba section in /etc/rc.d/rc.local_shutdown - -#stop wsdd2 daemon -if [ -x /etc/rc.d/rc.wsdd2 ]; then - /etc/rc.d/rc.wsdd2 stop -fi diff --git a/network/wsdd2/README.allowip6 b/network/wsdd2/README.allowip6 deleted file mode 100644 index 85009e9325..0000000000 --- a/network/wsdd2/README.allowip6 +++ /dev/null @@ -1,17 +0,0 @@ -It may be obvious, but its easy to forget; to access samba shares -using ip6 you need to allow ip6 addresses access to the server. If -you want to limit access to local ip6 addresses and you are using -the "hosts allow" option in smb.conf then add the following -address/masks to the end of any ip4 addresses you alread have listed - - fc00::/7 fe80::/64 ::1 - -this will allow link-local, unique-local, and local loop ip6 addresses - -Even if a machine has a public ip6 address, it will also have a -link-local one for ip6 sublayer operations of the Neighbor Discovery -Protocol as well as for some other protocols such as DHCPv6 - -if you are using a firewall, don't forget to allow access to port -5357 (tcp) and 3702 (udp) otherwise wsdd2 will not work. - diff --git a/network/wsdd2/doinst.sh b/network/wsdd2/doinst.sh deleted file mode 100644 index 194630ea25..0000000000 --- a/network/wsdd2/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 - chmod +x $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -preserve_perms() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ -e $OLD ]; then - cp -a $OLD ${NEW}.incoming - cat $NEW > ${NEW}.incoming - mv ${NEW}.incoming $NEW - fi - config $NEW -} - -preserve_perms etc/rc.d/rc.wsdd2.new diff --git a/network/wsdd2/rc.wsdd2 b/network/wsdd2/rc.wsdd2 deleted file mode 100644 index 1fcf58f995..0000000000 --- a/network/wsdd2/rc.wsdd2 +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/rc.wsdd2 -# -# start/stop/restart the wsdd2 daemon. -# -# To make wsdd2 start automatically at boot make sure this -# file is executable, and add the following entry to rc.local -# (uncommented) - -# if [ -x /etc/rc.d/rc.wsdd2 ]; then -# /etc/rc.d/rc.wsdd2 start -# fi - -# you may also add the following entry to rc.local_shutdown -# (uncommented) - -# if [ -x /etc/rc.d/rc.wsdd2 ]; then -# /etc/rc.d/rc.wsdd2 stop -# fi - -wsdd2_start() { - if [ -r /etc/samba/smb.conf -a -x /etc/rc.d/rc.samba -a -x /usr/sbin/wsdd2 ]; then - echo "Starting wsdd2: /usr/bin/wsdd2 -d" - /usr/sbin/wsdd2 -d - elif [ ! -r /etc/samba/smb.conf ]; then - echo "ERROR: samba not configured, so wsdd2 has no service to advertise" - fi -} -wsdd2_stop() { - #check something is running before trying to kill it. - if [ "x`ps -A|grep ' wsdd2'|wc -l`" != "x0" ]; then - killall wsdd2 - fi -} -wsdd2_restart() { - wsdd2_stop - sleep 1 - wsdd2_start -} -case "$1" in -'start') - #we don't want to run this more than once, - #so kill off any instance already running - wsdd2_stop - wsdd2_start - ;; -'stop') - wsdd2_stop - ;; -'restart') - wsdd2_restart - ;; -*) - # default is start - wsdd2_start -esac - diff --git a/network/wsdd2/slack-desc b/network/wsdd2/slack-desc deleted file mode 100644 index 41cfbcc117..0000000000 --- a/network/wsdd2/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -wsdd2: wsdd2 (WSD/LLMNR Discovery/Name Service Daemon) -wsdd2: -wsdd2: Provides samba share browsing for clients who don't support netbios -wsdd2: or are running ip6 (which netbios does not support). -wsdd2: This is based on the NETGEAR implimentation. -wsdd2: -wsdd2: Don't forget to allow local ip6 connections in your smb.conf file, -wsdd2: specifically, fc00::/7 fe80::/64 ::1 -wsdd2: Also in your firewall, make sure ports 3702 and 5355 are open. -wsdd2: -wsdd2: Home Page https://github.com/Netgear/wsdd2 diff --git a/network/wsdd2/wsdd2.SlackBuild b/network/wsdd2/wsdd2.SlackBuild deleted file mode 100644 index 072cf3d55d..0000000000 --- a/network/wsdd2/wsdd2.SlackBuild +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/bash - -# Slackware build script for wsdd2 - -# Copyright 2020,2022 Tim Dickson Scotland -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=wsdd2 -VERSION=${VERSION:-1.8.7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 {} \; - -#we are going to have to fix Makefile as we don't want systemd stuff -sed -i "/systemd/d" Makefile - -#patch the source to remove generally useless warning -# ie. warning about missing (entirely optional) parameters in smb.conf -patch wsdd2.c <${CWD}/wsdd2.patch -#note: hopefully upstream will fix this. https://github.com/Netgear/wsdd2/issues/39 - -make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" -make install debug_W=-1 debug_L=-1 DESTDIR=$PKG MANDIR="/usr/man" INSTALLPREFIX="usr" -find $PKG -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 - -#copy over the rc file -mkdir -p $PKG/etc/rc.d -cp -a $CWD/rc.${PRGNAM} $PKG/etc/rc.d/rc.${PRGNAM}.new -chown root:root $PKG/etc/rc.d/rc.${PRGNAM}.new -# now for docs -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/README.allowip6 > $PKG/usr/doc/$PRGNAM-$VERSION/README.allowip6 -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 - diff --git a/network/wsdd2/wsdd2.info b/network/wsdd2/wsdd2.info deleted file mode 100644 index a839c31ffe..0000000000 --- a/network/wsdd2/wsdd2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wsdd2" -VERSION="1.8.7" -HOMEPAGE="https://github.com/Netgear/wsdd2" -DOWNLOAD="https://github.com/Netgear/wsdd2/archive/1.8.7/wsdd2-1.8.7.tar.gz" -MD5SUM="6f59c63f07c8f42f05469d8020c0a604" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Tim Dickson" -EMAIL="dickson.tim@googlemail.com" diff --git a/network/wsdd2/wsdd2.patch b/network/wsdd2/wsdd2.patch deleted file mode 100644 index aec9c4baaa..0000000000 --- a/network/wsdd2/wsdd2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wsdd2.c 2021-08-09 20:22:46.000000000 +0100 -+++ wsdd2u.c 2022-04-22 11:22:12.125000000 +0100 -@@ -601,7 +601,7 @@ - - char buf[PAGE_SIZE]; - if (!fgets(buf, sizeof(buf), pp) || !buf[0] || buf[0] == '\n') { -- DEBUG(0, W, "cannot read %s from testparm", name); -+ DEBUG(1, W, "cannot read %s from testparm", name); - result = strdup(_default); - } else { // trim whitespace - char *p; diff --git a/network/x2goclient/x2goclient.SlackBuild b/network/x2goclient/x2goclient.SlackBuild index 8fb5f09e1a..36a8377b56 100644 --- a/network/x2goclient/x2goclient.SlackBuild +++ b/network/x2goclient/x2goclient.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=x2goclient -VERSION=${VERSION:-4.1.2.2} +VERSION=${VERSION:-4.1.2.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,7 +71,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 . \ @@ -80,12 +80,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 {} \; -# The newer libssh doesn't ship this library anymore -[[ "$(pkg-config --modversion libssh)" > "0.8" ]] && \ - sed -i "s| -lssh_threads||" x2goclient.pro +sed -i '/^MAKEOVERRIDES\s*=/ s/=.*$/=/' Makefile +sed -i '/^\.MAKEOVERRIDES\s*=/ s/=.*$/=/' Makefile +sed -i '/^\.MAKEFLAGS\s*=/ s/=.*$/=/' Makefile -sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@qmake@' Makefile -sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@lrelease@' Makefile +export QT_VERSION=5 make diff --git a/network/x2goclient/x2goclient.info b/network/x2goclient/x2goclient.info index c360e03d0d..67272c1ad6 100644 --- a/network/x2goclient/x2goclient.info +++ b/network/x2goclient/x2goclient.info @@ -1,8 +1,8 @@ PRGNAM="x2goclient" -VERSION="4.1.2.2" +VERSION="4.1.2.3" HOMEPAGE="http://www.x2go.org" -DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.2.tar.gz" -MD5SUM="1390b794b0a10f0a885dd7cf00f2acef" +DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.3.tar.gz" +MD5SUM="7af1dd74d2f36fc292944addcfebb3cc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nx-libs" diff --git a/network/x2goserver/x2goserver.SlackBuild b/network/x2goserver/x2goserver.SlackBuild index caa42c4eaa..10766d59a9 100644 --- a/network/x2goserver/x2goserver.SlackBuild +++ b/network/x2goserver/x2goserver.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=x2goserver -VERSION=${VERSION:-20201227_08aa5e6} +VERSION=${VERSION:-4.1.0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,7 +71,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/network/x2goserver/x2goserver.info b/network/x2goserver/x2goserver.info index 7dfbf73d3a..01a0704bb1 100644 --- a/network/x2goserver/x2goserver.info +++ b/network/x2goserver/x2goserver.info @@ -1,8 +1,8 @@ PRGNAM="x2goserver" -VERSION="20201227_08aa5e6" +VERSION="4.1.0.5" HOMEPAGE="http://www.x2go.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20201227_08aa5e6.tar.xz" -MD5SUM="46aad829313b85218841e1f818244a06" +DOWNLOAD="https://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.5.tar.gz" +MD5SUM="31d3031684d8fc782619270eb36ab58c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nx-libs perl-Config-Simple perl-File-ReadBackwards perl-DBD-SQLite perl-Capture-Tiny perl-Try-Tiny perl-Unix-Syslog perl-file-basedir perl-Switch" diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild index 3170bba6ec..0c11e6d5e7 100644 --- a/office/abiword/abiword.SlackBuild +++ b/office/abiword/abiword.SlackBuild @@ -93,6 +93,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# https://www.linuxfromscratch.org/blfs/view/svn/xsoft/AbiWord.html +sed -e '/libxml/a #include ' \ + -i src/af/util/xp/ut_stringbuf.cpp + patch -p1 < $CWD/enchant-2.1.patch # 20200622 bkw: don't let abiword create /root/.config/abiword/profile @@ -102,7 +106,7 @@ export CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache} export HOME=$( pwd )/tmphome CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \ -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./autogen.sh \ --prefix=/usr \ diff --git a/office/asymptote/asymptote.SlackBuild b/office/asymptote/asymptote.SlackBuild index 3c9d7da655..3a7ecea72e 100644 --- a/office/asymptote/asymptote.SlackBuild +++ b/office/asymptote/asymptote.SlackBuild @@ -89,7 +89,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-gc=system \ - --enable-offscreen \ + --disable-offscreen \ --disable-lsp \ --disable-gc-debug \ --disable-gc-full-debug \ diff --git a/office/evince/evince-46.3.1-kpathsea-header-files.patch b/office/evince/evince-46.3.1-kpathsea-header-files.patch new file mode 100644 index 0000000000..f1a0fb79b6 --- /dev/null +++ b/office/evince/evince-46.3.1-kpathsea-header-files.patch @@ -0,0 +1,10 @@ +--- evince-46.3.1/backend/dvi/mdvi-lib/private.h ++++ evince-46.3.1/backend/dvi/mdvi-lib/private.h +@@ -32,6 +32,7 @@ + # endif + #endif + ++#include + #include + #include + #include diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild index 730b0a038a..c18ee18be1 100644 --- a/office/evince/evince.SlackBuild +++ b/office/evince/evince.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=evince -VERSION=${VERSION:-41.5} +VERSION=${VERSION:-48.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,8 +76,12 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . +rm -f data/icons/hicolor # avoids find's "filesystem loop detected" find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +( cd data/icons ; ln -s . hicolor ) # put it back, JIC + +patch -p1 < $CWD/evince-46.3.1-kpathsea-header-files.patch mkdir build cd build @@ -96,7 +100,6 @@ cd build -Dcomics=enabled \ -Ddjvu=enabled \ -Ddvi=enabled \ - -Dt1lib=enabled \ -Dpdf=enabled \ -Dps=enabled \ -Dtiff=enabled \ diff --git a/office/evince/evince.info b/office/evince/evince.info index 1c15d2ac0e..9c759a9f1a 100644 --- a/office/evince/evince.info +++ b/office/evince/evince.info @@ -1,8 +1,8 @@ PRGNAM="evince" -VERSION="41.5" +VERSION="48.0" HOMEPAGE="http://projects.gnome.org/evince/" -DOWNLOAD="https://download.gnome.org/sources/evince/41/evince-41.5.tar.xz" -MD5SUM="08bebf04d93b8f7f03d5a865ab447f50" +DOWNLOAD="https://download.gnome.org/sources/evince/48/evince-48.0.tar.xz" +MD5SUM="ffbe9e52580033231855478a18b90dc5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libhandy" diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild index ad9f607200..3b936a026f 100644 --- a/office/gnucash/gnucash.SlackBuild +++ b/office/gnucash/gnucash.SlackBuild @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info index d4bb5db21e..be7f610b8c 100644 --- a/office/gnucash/gnucash.info +++ b/office/gnucash/gnucash.info @@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-5.12.tar.bz2" MD5SUM="f83e476b11f44686830b68ac63ab51bd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="webkit2gtk gtest" +REQUIRES="webkit2gtk4.1 gtest" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/office/goldendict/ffmpeg7.patch b/office/goldendict/ffmpeg7.patch new file mode 100644 index 0000000000..d952d9e2a0 --- /dev/null +++ b/office/goldendict/ffmpeg7.patch @@ -0,0 +1,104 @@ +From 718462c5c1e2b6f3064f921c0800e45b8d5b84b8 Mon Sep 17 00:00:00 2001 +From: Liao Junxuan +Date: Fri, 28 Jun 2024 18:06:13 +0800 +Subject: [PATCH] add support for ffmpeg 7.0 + +FF_API_OLD_CHANNEL_LAYOUT is removed in libavcodec 61. +See https://patchwork.ffmpeg.org/project/ffmpeg/cover/20240125134425.374-1-jamrial@gmail.com/ . +--- + ffmpegaudio.cc | 33 ++++++++++++++++++++++++++++----- + 1 file changed, 28 insertions(+), 5 deletions(-) + +diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc +index a97d6dcad..5ef602ad8 100644 +--- a/ffmpegaudio.cc ++++ b/ffmpegaudio.cc +@@ -118,6 +118,13 @@ struct DecoderContext + bool play( QString & errorString ); + bool normalizeAudio( AVFrame * frame, vector & samples ); + void playFrame( AVFrame * frame ); ++ int nbChannels() { ++#if LIBAVCODEC_VERSION_MAJOR >= 61 ++ return codecContext_->ch_layout.nb_channels; ++#else ++ return codecContext_->channels; ++#endif ++ } + }; + + DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCancelled ): +@@ -261,7 +268,7 @@ bool DecoderContext::openCodec( QString & errorString ) + } + + gdDebug( "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name, +- codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) ); ++ nbChannels(), codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) ); + + if ( codecContext_->sample_fmt == AV_SAMPLE_FMT_S32 || + codecContext_->sample_fmt == AV_SAMPLE_FMT_S32P || +@@ -270,6 +277,21 @@ bool DecoderContext::openCodec( QString & errorString ) + codecContext_->sample_fmt == AV_SAMPLE_FMT_DBL || + codecContext_->sample_fmt == AV_SAMPLE_FMT_DBLP ) + { ++#if LIBAVCODEC_VERSION_MAJOR >= 61 ++ int ret = swr_alloc_set_opts2( &swr_, ++ &codecContext_->ch_layout, ++ AV_SAMPLE_FMT_S16, ++ codecContext_->sample_rate, ++ &codecContext_->ch_layout, ++ codecContext_->sample_fmt, ++ codecContext_->sample_rate, ++ 0, ++ NULL ); ++ if ( ret < 0 ) { ++ errorString = QObject::tr( "swr_alloc_set_opts2() failed: %1." ).arg( avErrorString( ret ) ); ++ return false; ++ } ++#else + swr_ = swr_alloc_set_opts( NULL, + codecContext_->channel_layout, + AV_SAMPLE_FMT_S16, +@@ -279,6 +301,7 @@ bool DecoderContext::openCodec( QString & errorString ) + codecContext_->sample_rate, + 0, + NULL ); ++#endif + swr_init( swr_ ); + } + +@@ -351,7 +374,7 @@ bool DecoderContext::openOutputDevice( QString & errorString ) + + ao_sample_format aoSampleFormat; + memset (&aoSampleFormat, 0, sizeof(aoSampleFormat) ); +- aoSampleFormat.channels = codecContext_->channels; ++ aoSampleFormat.channels = nbChannels(); + aoSampleFormat.rate = codecContext_->sample_rate; + aoSampleFormat.byte_format = AO_FMT_NATIVE; + aoSampleFormat.matrix = 0; +@@ -520,7 +543,7 @@ static inline int32_t toInt32( double v ) + bool DecoderContext::normalizeAudio( AVFrame * frame, vector & samples ) + { + int lineSize = 0; +- int dataSize = av_samples_get_buffer_size( &lineSize, codecContext_->channels, ++ int dataSize = av_samples_get_buffer_size( &lineSize, nbChannels(), + frame->nb_samples, codecContext_->sample_fmt, 1 ); + + // Portions from: https://code.google.com/p/lavfilters/source/browse/decoder/LAVAudio/LAVAudio.cpp +@@ -542,7 +565,7 @@ bool DecoderContext::normalizeAudio( AVFrame * frame, vector & samples ) + uint8_t * out = ( uint8_t * )&samples.front(); + for ( int i = 0; i < frame->nb_samples; i++ ) + { +- for ( int ch = 0; ch < codecContext_->channels; ch++ ) ++ for ( int ch = 0; ch < nbChannels(); ch++ ) + { + *out++ = ( ( uint8_t * )frame->extended_data[ch] )[i]; + } +@@ -556,7 +579,7 @@ bool DecoderContext::normalizeAudio( AVFrame * frame, vector & samples ) + int16_t * out = ( int16_t * )&samples.front(); + for ( int i = 0; i < frame->nb_samples; i++ ) + { +- for ( int ch = 0; ch < codecContext_->channels; ch++ ) ++ for ( int ch = 0; ch < nbChannels(); ch++ ) + { + *out++ = ( ( int16_t * )frame->extended_data[ch] )[i]; + } diff --git a/office/goldendict/goldendict.SlackBuild b/office/goldendict/goldendict.SlackBuild index 088823db1b..2e4d5428c8 100644 --- a/office/goldendict/goldendict.SlackBuild +++ b/office/goldendict/goldendict.SlackBuild @@ -69,6 +69,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/ffmpeg7.patch + # Fixing QMake in goldendict.pro file (source: aur.archlinux.org) echo "QMAKE_CFLAGS_RELEASE = ${SLKCFLAGS}" >> goldendict.pro echo "QMAKE_CXXFLAGS_RELEASE = ${SLKCFLAGS}" >> goldendict.pro diff --git a/office/kbibtex/kbibtex.SlackBuild b/office/kbibtex/kbibtex.SlackBuild index 5f3ea62116..bef1528243 100644 --- a/office/kbibtex/kbibtex.SlackBuild +++ b/office/kbibtex/kbibtex.SlackBuild @@ -81,6 +81,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix build with icu >= 75 +sed -i 's|CMAKE_CXX_STANDARD 11|CMAKE_CXX_STANDARD 17|' CMakeLists.txt + patch -p1 < $CWD/desktop_perms.patch mkdir -p build diff --git a/office/neoleo/neoleo.SlackBuild b/office/neoleo/neoleo.SlackBuild index c8d46d20f8..aa5498cb02 100644 --- a/office/neoleo/neoleo.SlackBuild +++ b/office/neoleo/neoleo.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=neoleo -VERSION=${VERSION:-13.1} +VERSION=${VERSION:-15.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/office/neoleo/neoleo.info b/office/neoleo/neoleo.info index fcd0c96345..58ce188634 100644 --- a/office/neoleo/neoleo.info +++ b/office/neoleo/neoleo.info @@ -1,10 +1,10 @@ PRGNAM="neoleo" -VERSION="13.1" +VERSION="15.0" HOMEPAGE="https://github.com/blippy/neoleo" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/blippy/neoleo/releases/download/v13.1/neoleo-13.1.tar.gz" -MD5SUM_x86_64="3d2ffd770b946b1862ff6a8a21edeb9d" +DOWNLOAD_x86_64="https://github.com/blippy/neoleo/releases/download/v15.0/neoleo-15.0.tar.gz" +MD5SUM_x86_64="1f437de908c637a942984307e9a50d69" REQUIRES="" MAINTAINER="Mark Carter" EMAIL="alt.mcarter@gmail.com" diff --git a/office/paps/fmt-12.patch b/office/paps/fmt-12.patch new file mode 100644 index 0000000000..4c77137278 --- /dev/null +++ b/office/paps/fmt-12.patch @@ -0,0 +1,29 @@ +From a26a20d7ca3feb08476a8a19fd97c3ececcc1e2e Mon Sep 17 00:00:00 2001 +From: Nicolas PARLANT +Date: Fri, 11 Jul 2025 07:23:51 +0200 +Subject: [PATCH] Replace deprecated fmt::localtime with std::localtime + +fmt::localtime is deprecated since fmt 11.2.0 + +Signed-off-by: Nicolas PARLANT +--- + src/format_from_dict.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/format_from_dict.cc b/src/format_from_dict.cc +index bcad60e..ce72e99 100644 +--- a/src/format_from_dict.cc ++++ b/src/format_from_dict.cc +@@ -54,7 +54,11 @@ static string scalar_to_string(scalar_t scalar, + time_t val = get(scalar); + if (!spec.length()) + return to_string(val); +- return format(runtime(format("{{:{}}}", spec)), fmt::localtime(val)); ++ const auto *tm = std::localtime(&val); ++ if (tm == nullptr) ++ return {}; ++ ++ return format(runtime(format("{{:{}}}", spec)), *tm); + } + throw runtime_error("Unrecognized type!"); // I shouldn't be here! + } diff --git a/office/paps/glib-2.82.patch b/office/paps/glib-2.82.patch new file mode 100644 index 0000000000..f936ce4461 --- /dev/null +++ b/office/paps/glib-2.82.patch @@ -0,0 +1,45 @@ +From e6ec698be127822661e31f7fca7d2e0107944b24 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Tue, 17 Sep 2024 13:58:46 -0400 +Subject: [PATCH] Fix build with glib 2.82 + +g_utf8_next_char no longer includes a cast to char* as of this change: + +https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016 + +Signed-off-by: Yaakov Selkowitz +--- + src/paps.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/paps.cc b/src/paps.cc +index fde04d1..3ab9a7c 100644 +--- a/src/paps.cc ++++ b/src/paps.cc +@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context, + while (p != nullptr && *p) + { + wc = g_utf8_get_char (p); +- next = g_utf8_next_char (p); ++ next = (char *) g_utf8_next_char (p); + if (wc == (gunichar)-1) + { + fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ()); +@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context, + para->length = p - last_para; + /* handle dos line breaks */ + if (wc == '\r' && *next == '\n') +- next = g_utf8_next_char(next); ++ next = (char *) g_utf8_next_char(next); + para->layout = pango_layout_new (pango_context); + + if (page_layout->cpi > 0.0L) +@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context, + g_free (newtext); + + para->length = i; +- next = g_utf8_offset_to_pointer (para->text, para->length); ++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length); + wc = g_utf8_get_char (g_utf8_prev_char (next)); + } + else diff --git a/office/paps/paps.SlackBuild b/office/paps/paps.SlackBuild index 07883a48fb..fbce3b7f07 100644 --- a/office/paps/paps.SlackBuild +++ b/office/paps/paps.SlackBuild @@ -98,6 +98,9 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ # including ".SlackBuild". patch -p1 < $CWD/src-to-paps.diff +patch -p1 < $CWD/glib-2.82.patch +patch -p1 < $CWD/fmt-12.patch + ./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/office/qpdfview/qpdfview.SlackBuild b/office/qpdfview/qpdfview.SlackBuild index 4e16cd0dc8..ddf9c860da 100644 --- a/office/qpdfview/qpdfview.SlackBuild +++ b/office/qpdfview/qpdfview.SlackBuild @@ -63,6 +63,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + +sed -i 's|c++11|c++17|' qpdfview.pri + # Add localizations lrelease-qt5 qpdfview.pro diff --git a/office/scribus/scribus-1.6.4_poppler-25.06.patch b/office/scribus/scribus-1.6.4_poppler-25.06.patch new file mode 100644 index 0000000000..4246462e42 --- /dev/null +++ b/office/scribus/scribus-1.6.4_poppler-25.06.patch @@ -0,0 +1,17 @@ +diff -Naur scribus-1.6.4.orig/scribus/plugins/import/pdf/slaoutput.cpp scribus-1.6.4/scribus/plugins/import/pdf/slaoutput.cpp +--- scribus-1.6.4.orig/scribus/plugins/import/pdf/slaoutput.cpp 2025-04-20 15:52:19.000000000 +0200 ++++ scribus-1.6.4/scribus/plugins/import/pdf/slaoutput.cpp 2025-06-05 07:06:10.719000000 +0200 +@@ -606,7 +606,12 @@ + FormWidget *fm = m_formWidgets->getWidget(i); + if (!fm) + continue; +- AnnotWidget *ano = fm->getWidgetAnnotation(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 06, 0) ++ std::shared_ptr anoSharedPtr = fm->getWidgetAnnotation(); ++ AnnotWidget* ano = anoSharedPtr.get(); ++#else ++ AnnotWidget* ano = fm->getWidgetAnnotation(); ++#endif + if (!ano) + continue; + if (ano != (AnnotWidget*) annota) diff --git a/office/scribus/scribus-1.6.4_poppler-25.07.patch b/office/scribus/scribus-1.6.4_poppler-25.07.patch new file mode 100644 index 0000000000..9ea959c066 --- /dev/null +++ b/office/scribus/scribus-1.6.4_poppler-25.07.patch @@ -0,0 +1,38 @@ +Index: scribus/plugins/import/pdf/slaoutput.cpp +=================================================================== +--- scribus/plugins/import/pdf/slaoutput.cpp (revision 26940) ++++ scribus/plugins/import/pdf/slaoutput.cpp (revision 26941) +@@ -3255,10 +3255,15 @@ + break; + case fontTrueType: + case fontTrueTypeOT: +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0) + if (!fileName.empty()) + ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); + else ++ ff = FoFiTrueType::make(fontsrc->buf, fontLoc->fontNum); ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!fileName.empty()) ++ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); ++ else + ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum); + #elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) + if (!fileName.empty()) +@@ -3400,10 +3405,15 @@ + #endif + else + { +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0) + if (!fileName.empty()) + ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); + else ++ ff = FoFiTrueType::make(fontsrc->buf, fontLoc->fontNum); ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!fileName.empty()) ++ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); ++ else + ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum); + #elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) + if (!fileName.empty()) diff --git a/office/scribus/scribus-1.6.4_poppler-25.09.patch b/office/scribus/scribus-1.6.4_poppler-25.09.patch new file mode 100644 index 0000000000..9702dabc6a --- /dev/null +++ b/office/scribus/scribus-1.6.4_poppler-25.09.patch @@ -0,0 +1,147 @@ +Index: scribus16x/scribus/plugins/import/pdf/slaoutput.cpp +=================================================================== +--- scribus16x/scribus/plugins/import/pdf/slaoutput.cpp (revision 27005) ++++ scribus16x/scribus/plugins/import/pdf/slaoutput.cpp (revision 27006) +@@ -1480,7 +1480,11 @@ + m_graphicStack.restore(); + } + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++void SlaOutputDev::beginTransparencyGroup(GfxState *state, const std::array& bbox, GfxColorSpace * /*blendingColorSpace*/, bool isolated, bool knockout, bool forSoftMask) ++#else + void SlaOutputDev::beginTransparencyGroup(GfxState *state, const double *bbox, GfxColorSpace * /*blendingColorSpace*/, bool isolated, bool knockout, bool forSoftMask) ++#endif + { + // qDebug() << "SlaOutputDev::beginTransparencyGroup isolated:" << isolated << "knockout:" << knockout << "forSoftMask:" << forSoftMask; + pushGroup("", forSoftMask); +@@ -1487,7 +1491,11 @@ + m_groupStack.top().isolated = isolated; + } + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++void SlaOutputDev::paintTransparencyGroup(GfxState *state, const std::array& bbox) ++#else + void SlaOutputDev::paintTransparencyGroup(GfxState *state, const double *bbox) ++#endif + { + // qDebug() << "SlaOutputDev::paintTransparencyGroup"; + if (m_groupStack.count() != 0) +@@ -1586,7 +1594,11 @@ + m_tmpSel->clear(); + } + +-void SlaOutputDev::setSoftMask(GfxState * /*state*/, const double * bbox, bool alpha, Function *transferFunc, GfxColor * /*backdropColor*/) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++void SlaOutputDev::setSoftMask(GfxState* /*state*/, const std::array& bbox, bool alpha, Function* transferFunc, GfxColor* /*backdropColor*/) ++#else ++void SlaOutputDev::setSoftMask(GfxState* /*state*/, const double* bbox, bool alpha, Function* transferFunc, GfxColor* /*backdropColor*/) ++#endif + { + if (m_groupStack.count() <= 0) + return; +@@ -2341,14 +2353,20 @@ + return true; + } + +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) +-bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx* /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const std::array& mat, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx* /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) + #else +-bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, const double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, const double *mat, const double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) ++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx* /*gfx*/, Catalog *cat, Object *str, const double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, const double *mat, const double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) + #endif + { + // qDebug() << "SlaOutputDev::tilingPatternFill"; +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++ const std::array& bbox = tPat->getBBox(); ++ const std::array& pmat = tPat->getMatrix(); ++ Dict *resDict = tPat->getResDict(); ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) + const double *bbox = tPat->getBBox(); + const double *pmat = tPat->getMatrix(); + Dict *resDict = tPat->getResDict(); +@@ -3835,7 +3853,11 @@ + return CommonStrings::None; + if (color->getSpace() == AnnotColor::colorRGB) + { ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++ const std::array& color_data = color->getValues(); ++#else + const double *color_data = color->getValues(); ++#endif + double Rc = color_data[0]; + double Gc = color_data[1]; + double Bc = color_data[2]; +@@ -3844,7 +3866,11 @@ + } + else if (color->getSpace() == AnnotColor::colorCMYK) + { ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++ const std::array& color_data = color->getValues(); ++#else + const double *color_data = color->getValues(); ++#endif + double Cc = color_data[0]; + double Mc = color_data[1]; + double Yc = color_data[2]; +@@ -3854,7 +3880,11 @@ + } + else if (color->getSpace() == AnnotColor::colorGray) + { ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++ const std::array& color_data = color->getValues(); ++#else + const double *color_data = color->getValues(); ++#endif + double Kc = 1.0 - color_data[0]; + tmp.setCmykColorF(0, 0, 0, Kc); + fNam = m_doc->PageColors.tryAddColor(namPrefix+tmp.name(), tmp); +Index: scribus16x/scribus/plugins/import/pdf/slaoutput.h +=================================================================== +--- scribus16x/scribus/plugins/import/pdf/slaoutput.h (revision 27005) ++++ scribus16x/scribus/plugins/import/pdf/slaoutput.h (revision 27006) +@@ -20,6 +20,7 @@ + #include + #include + ++#include + #include + + #include "fpointarray.h" +@@ -199,7 +200,10 @@ + void stroke(GfxState *state) override; + void fill(GfxState *state) override; + void eoFill(GfxState *state) override; +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++ ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const std::array& mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override; ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) + bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override; + #else + bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, const double *pmat, int paintType, int tilingType, Dict *resDict, const double *mat, const double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override; +@@ -262,10 +266,20 @@ + bool maskInvert, bool maskInterpolate) override; + + //----- transparency groups and soft masks ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++ void beginTransparencyGroup(GfxState *state, const std::array& bbox, GfxColorSpace* /*blendingColorSpace*/, bool /*isolated*/, bool /*knockout*/, bool /*forSoftMask*/) override; ++ void paintTransparencyGroup(GfxState *state, const std::array& bbox) override; ++#else + void beginTransparencyGroup(GfxState *state, const double *bbox, GfxColorSpace * /*blendingColorSpace*/, bool /*isolated*/, bool /*knockout*/, bool /*forSoftMask*/) override; + void paintTransparencyGroup(GfxState *state, const double *bbox) override; ++#endif + void endTransparencyGroup(GfxState *state) override; ++ ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 9, 0) ++ void setSoftMask(GfxState * /*state*/, const std::array & /*bbox*/, bool /*alpha*/, Function * /*transferFunc*/, GfxColor * /*backdropColor*/) override; ++#else + void setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool /*alpha*/, Function * /*transferFunc*/, GfxColor * /*backdropColor*/) override; ++#endif + void clearSoftMask(GfxState * /*state*/) override; + + void updateFillColor(GfxState *state) override; diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild index d68fdc8d4c..157b8ba626 100644 --- a/office/scribus/scribus.SlackBuild +++ b/office/scribus/scribus.SlackBuild @@ -90,6 +90,10 @@ else PODOFO=off fi +patch -p1 < $CWD/scribus-1.6.4_poppler-25.06.patch +patch -p0 < $CWD/scribus-1.6.4_poppler-25.07.patch +patch -p1 < $CWD/scribus-1.6.4_poppler-25.09.patch + mkdir build cd build cmake \ diff --git a/office/task/task.SlackBuild b/office/task/task.SlackBuild index 447f67d756..29a2fd8324 100644 --- a/office/task/task.SlackBuild +++ b/office/task/task.SlackBuild @@ -86,6 +86,7 @@ find -L . \ cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_INSTALL_PREFIX=/usr make clean diff --git a/office/texlive-extra/texlive-extra.SlackBuild b/office/texlive-extra/texlive-extra.SlackBuild index 653de6acfb..65d2810706 100644 --- a/office/texlive-extra/texlive-extra.SlackBuild +++ b/office/texlive-extra/texlive-extra.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=texlive-extra -TEXMFVERSION=${TEXMFVERSION:-230322} -VERSION=${VERSION:-2023.230322} +TEXMFVERSION=${TEXMFVERSION:-240409} +VERSION=${VERSION:-2024.240409} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -64,13 +64,6 @@ chmod -R u+w,go-w,a+rX-st $PKG mv $PKG$TEXMFROOT/texmf-dist/linked_scripts/* $PKG/usr/bin rmdir $PKG$TEXMFROOT/texmf-dist/linked_scripts -# Move biber binary to $PATH -case $ARCH in - "x86_64") mv $PKG$TEXMFROOT/texmf-dist/bin/x86_64-linux/biber $PKG/usr/bin ;; - "i586") mv $PKG$TEXMFROOT/texmf-dist/bin/i386-linux/biber $PKG/usr/bin ;; -esac -rm -rf $PKG$TEXMFROOT/texmf-dist/bin - # Install index of provided tex packages to the docs mv $PKG$TEXMFROOT/texmf-dist/packages.extra.gz $PKG/usr/doc/texlive-$VERSION mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/office/texlive-extra/texlive-extra.info b/office/texlive-extra/texlive-extra.info index 287ea7cc11..6cf231dd15 100644 --- a/office/texlive-extra/texlive-extra.info +++ b/office/texlive-extra/texlive-extra.info @@ -1,8 +1,8 @@ PRGNAM="texlive-extra" -VERSION="2023.230322" +VERSION="2024.240409" HOMEPAGE="https://tug.org/texlive/" -DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/texlive-extra-230322.tar.xz" -MD5SUM="2a6406b9fca2625cb1d4306e33fe4a3e" +DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/texlive-extra-240409.tar.xz" +MD5SUM="4d1ebe3f093c6cc9ce03b065188c239d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" diff --git a/office/xournal/xournal-0.4.8-c99-fix.patch b/office/xournal/xournal-0.4.8-c99-fix.patch new file mode 100644 index 0000000000..ee3689cddd --- /dev/null +++ b/office/xournal/xournal-0.4.8-c99-fix.patch @@ -0,0 +1,89 @@ +Bug: https://bugs.gentoo.org/875158 + +Patch: https://src.fedoraproject.org/rpms/xournal/raw/dacd5bf30ec95debca62946868d9450f68ea54de/f/xournal-c99-1.patch +Patch: https://src.fedoraproject.org/rpms/xournal/raw/dacd5bf30ec95debca62946868d9450f68ea54de/f/xournal-c99-2.patch +Author: Denis Auroux +Date: Sun Jan 24 15:48:16 2021 -0500 + + Fix implicit function declarations by including config.h in ttsubset/*.c + +--- a/src/ttsubset/list.c ++++ b/src/ttsubset/list.c +@@ -33,7 +33,7 @@ + * + */ + +-/* $Id$ */ ++/* $Id: list.c,v 1.4 2004/09/10 18:59:06 jody Exp $ */ + /* @(#)list.c 1.7 03/02/06 SMI */ + + /* +@@ -44,6 +44,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #include + #include + #ifdef MALLOC_TRACE +--- a/src/ttsubset/sft.c ++++ b/src/ttsubset/sft.c +@@ -33,7 +33,7 @@ + * + */ + +-/* $Id$ */ ++/* $Id: sft.c,v 1.9 2005/01/04 20:10:46 jody Exp $ */ + /* @(#)sft.c 1.17 03/01/08 SMI */ + + /* +@@ -43,6 +43,10 @@ + * @version 1.0 + */ + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #include + #include + #include +--- a/src/ttsubset/ttcr.c ++++ b/src/ttsubset/ttcr.c +@@ -33,7 +33,7 @@ + * + */ + +-/* $Id$ */ ++/* $Id: ttcr.c,v 1.7 2005/01/04 20:10:46 jody Exp $ */ + /* @(#)ttcr.c 1.7 03/01/08 SMI */ + + /* +@@ -44,6 +44,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #include + #ifdef HAVE_UNISTD_H + #include + +Add missing include directives for make_dashed, set_cursor_busy. + +--- a/src/xo-image.c ++++ b/src/xo-image.c +@@ -25,6 +25,8 @@ + #include "xo-support.h" + #include "xo-image.h" + #include "xo-misc.h" ++#include "xo-selection.h" ++#include "xo-paint.h" + + // create pixbuf from buffer, or return NULL on failure + GdkPixbuf *pixbuf_from_buffer(const gchar *buf, gsize buflen) diff --git a/office/xournal/xournal.SlackBuild b/office/xournal/xournal.SlackBuild index 23c177c011..595aa842b5 100644 --- a/office/xournal/xournal.SlackBuild +++ b/office/xournal/xournal.SlackBuild @@ -61,6 +61,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/xournal-0.4.8-c99-fix.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/perl/mod_perl/mod_perl.SlackBuild b/perl/mod_perl/mod_perl.SlackBuild index d197c0b49d..5a5fde9d5a 100644 --- a/perl/mod_perl/mod_perl.SlackBuild +++ b/perl/mod_perl/mod_perl.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 {} \; +# Thanks to msantinho @ LQ! +patch -p0 < $CWD/r1910623.patch + # Thanks to ARCH Linux sed -i -e '1098,1102d' Apache-Test/lib/Apache/TestRun.pm sed -i '51,56c push @INC, "xs/tables/current24";' lib/ModPerl/MapUtil.pm diff --git a/perl/mod_perl/r1910623.patch b/perl/mod_perl/r1910623.patch new file mode 100644 index 0000000000..a6939c54ec --- /dev/null +++ b/perl/mod_perl/r1910623.patch @@ -0,0 +1,23 @@ +Author: stevehay +Date: Tue Jun 27 08:38:15 2023 +New Revision: 1910623 + +Stop using do_open9() - this deprecated function was removed in 5.37.1 + +Patch by Jitka Plesnikova from https://rt.cpan.org/Ticket/Display.html?id=148451 + +Index: src/modules/perl/modperl_io.c +=================================================================== +--- src/modules/perl/modperl_io.c (revision 1910622) ++++ src/modules/perl/modperl_io.c (revision 1910623) +@@ -116,8 +116,8 @@ + save_gp(handle, 1); + + sv_setref_pv(sv, "Apache2::RequestRec", (void*)r); +- status = do_open9(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2", +- 9, FALSE, mode, 0, (PerlIO *)NULL, sv, 1); ++ status = do_openn(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2", ++ 9, FALSE, mode, 0, (PerlIO *)NULL, &sv, 1); + if (status == 0) { + Perl_croak(aTHX_ "Failed to open STD%s: %" SVf, + mode == O_RDONLY ? "IN" : "OUT", get_sv("!", TRUE)); diff --git a/perl/perl-Getopt-Long-Descriptive/perl-Getopt-Long-Descriptive.SlackBuild b/perl/perl-Getopt-Long-Descriptive/perl-Getopt-Long-Descriptive.SlackBuild index 729cbc0a91..d75c10fa20 100644 --- a/perl/perl-Getopt-Long-Descriptive/perl-Getopt-Long-Descriptive.SlackBuild +++ b/perl/perl-Getopt-Long-Descriptive/perl-Getopt-Long-Descriptive.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-Getopt-Long-Descriptive -VERSION=${VERSION:-0.111} +VERSION=${VERSION:-0.115} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/perl/perl-Getopt-Long-Descriptive/perl-Getopt-Long-Descriptive.info b/perl/perl-Getopt-Long-Descriptive/perl-Getopt-Long-Descriptive.info index 41e6af6f70..552f3a042c 100644 --- a/perl/perl-Getopt-Long-Descriptive/perl-Getopt-Long-Descriptive.info +++ b/perl/perl-Getopt-Long-Descriptive/perl-Getopt-Long-Descriptive.info @@ -1,8 +1,8 @@ PRGNAM="perl-Getopt-Long-Descriptive" -VERSION="0.111" +VERSION="0.115" HOMEPAGE="https://github.com/rjbs/Getopt-Long-Descriptive" -DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.111.tar.gz" -MD5SUM="c84345ef2988f0ef0f9606c25069ddf6" +DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.115.tar.gz" +MD5SUM="7547d4d77664b51b5ee3e93d3d680f59" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-Params-Validate perl-Sub-Exporter perl-Test-Warnings perl-CPAN-Meta-Check" diff --git a/perl/perl-IO-Tty/README b/perl/perl-IO-Tty/README deleted file mode 100644 index 36d395c6c8..0000000000 --- a/perl/perl-IO-Tty/README +++ /dev/null @@ -1,10 +0,0 @@ -perl-IO-Tty (Pseudo TTY object class) - -IO::Tty - Perl extension that provides an interface to allow the -creation of a pseudo tty. - -IO::Tty is used internally by IO::Pty to create a pseudo-tty. Do not -use it directly except to import constants, use IO::Pty. - -IO::Pty inherits from IO::Handle and so provides all the methods -defined by the IO::Handle package. diff --git a/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild b/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild deleted file mode 100644 index 695202d8c0..0000000000 --- a/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -# Slackware build script for perl-IO-Tty - -# Written by ruario - -# Original version of this script had no license. B. Watson's -# modified version is licensed under the WTFPL. See -# http://www.wtfpl.net/txt/copying/ for details. - -# 20240814 bkw: update for v1.20. -# 20230224 bkw: -# - new maintainer. -# - update for v1.17. -# - add license. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=perl-IO-Tty -VERSION=${VERSION:-1.20} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCNAM="$(printf $PRGNAM | cut -d- -f2-)" - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -perl Makefile.PL \ - PREFIX=/usr \ - INSTALLDIRS=vendor \ - INSTALLVENDORMAN3DIR=/usr/man/man3 -make -strip blib/arch/auto/IO/Tty/Tty.so -make test -make install DESTDIR=$PKG -gzip $PKG/usr/man/man*/* - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -find $PKG -depth -type d -empty -delete || true - -PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKGDOC -cp -a ChangeLog README* $PKGDOC -cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/perl/perl-IO-Tty/perl-IO-Tty.info b/perl/perl-IO-Tty/perl-IO-Tty.info deleted file mode 100644 index 529da315f3..0000000000 --- a/perl/perl-IO-Tty/perl-IO-Tty.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="perl-IO-Tty" -VERSION="1.20" -HOMEPAGE="https://metacpan.org/pod/IO::Tty" -DOWNLOAD="https://cpan.metacpan.org/authors/id/T/TO/TODDR/IO-Tty-1.20.tar.gz" -MD5SUM="b46e30de0e2b8fd4d17fb32002a2d03c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/perl/perl-IO-Tty/slack-desc b/perl/perl-IO-Tty/slack-desc deleted file mode 100644 index 191c529789..0000000000 --- a/perl/perl-IO-Tty/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -perl-IO-Tty: perl-IO-Tty (Pseudo TTY object class) -perl-IO-Tty: -perl-IO-Tty: Perl extension that provides an interface to allow the creation of a -perl-IO-Tty: pseudo tty. -perl-IO-Tty: -perl-IO-Tty: -perl-IO-Tty: -perl-IO-Tty: -perl-IO-Tty: -perl-IO-Tty: -perl-IO-Tty: diff --git a/perl/perl-SDL/perl-SDL.SlackBuild b/perl/perl-SDL/perl-SDL.SlackBuild index 25abb4f80d..e52729068c 100644 --- a/perl/perl-SDL/perl-SDL.SlackBuild +++ b/perl/perl-SDL/perl-SDL.SlackBuild @@ -80,6 +80,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 {} \; +export CFLAGS="$SLKCFLAGS -fpermissive -std=gnu17" + perl Build.PL \ prefix=/usr \ installdirs=vendor \ diff --git a/perl/perl-Test-Trap/perl-Test-Trap.SlackBuild b/perl/perl-Test-Trap/perl-Test-Trap.SlackBuild index 68522b6885..23e77549fa 100644 --- a/perl/perl-Test-Trap/perl-Test-Trap.SlackBuild +++ b/perl/perl-Test-Trap/perl-Test-Trap.SlackBuild @@ -7,7 +7,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-Test-Trap -VERSION=${VERSION:-0.3.2} +VERSION=${VERSION:-0.3.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/perl/perl-Test-Trap/perl-Test-Trap.info b/perl/perl-Test-Trap/perl-Test-Trap.info index e12974bd2f..b6fdfd77cf 100644 --- a/perl/perl-Test-Trap/perl-Test-Trap.info +++ b/perl/perl-Test-Trap/perl-Test-Trap.info @@ -1,8 +1,8 @@ PRGNAM="perl-Test-Trap" -VERSION="0.3.2" +VERSION="0.3.5" HOMEPAGE="https://metacpan.org/pod/Test::Trap" -DOWNLOAD="https://cpan.metacpan.org/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.2.tar.gz" -MD5SUM="5ba3fd70ad9776adf972f734872b4760" +DOWNLOAD="https://cpan.metacpan.org/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.5.tar.gz" +MD5SUM="6eb90a553c1978b54f5fb599b3804688" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-data-dump" diff --git a/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-declaration.patch b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-declaration.patch new file mode 100644 index 0000000000..5c0e9ec985 --- /dev/null +++ b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-declaration.patch @@ -0,0 +1,11 @@ +--- map8.h ++++ map8.h +@@ -81,7 +81,7 @@ + + U16* map8_to_str16(Map8*, U8*, U16*, int, int*); + U8* map8_to_str8 (Map8*, U16*, U8*, int, int*); +-U8* map8_recode_8(Map8*, Map8*, U8*, U8*, int, int*); ++U8* map8_recode8 (Map8*, Map8*, U8*, U8*, int, int*); + + int map8_empty_block(Map8*, U8); + diff --git a/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-type.patch b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-type.patch new file mode 100644 index 0000000000..3ed151253e --- /dev/null +++ b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-type.patch @@ -0,0 +1,11 @@ +--- Map8.xs ++++ Map8.xs +@@ -348,7 +348,7 @@ + Map8* m2 + PREINIT: + STRLEN len; +- STRLEN rlen; ++ int rlen; + char* res; + INPUT: + char* str = SvPV(ST(2), len); diff --git a/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.13-recode.patch b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.13-recode.patch new file mode 100644 index 0000000000..3f4a99f93f --- /dev/null +++ b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.13-recode.patch @@ -0,0 +1,22 @@ +--- Changes ++++ Changes +@@ -48,7 +48,7 @@ + + Release 0.08 + +- A little patch to Makefile.PL from Andreas Knig that makes the ++ A little patch to Makefile.PL from Andreas König that makes the + umap program install by default. + + Added some Unicode::Map8 compatibility stuff to the interface. +--- README ++++ README +@@ -231,7 +231,7 @@ + + COPYRIGHT + +- 1998-1999 Gisle Aas. All rights reserved. ++ © 1998-1999 Gisle Aas. All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the same terms as Perl itself. diff --git a/perl/perl-Unicode-Map8/perl-Unicode-Map8.SlackBuild b/perl/perl-Unicode-Map8/perl-Unicode-Map8.SlackBuild index fba2954438..a7edbb34a6 100644 --- a/perl/perl-Unicode-Map8/perl-Unicode-Map8.SlackBuild +++ b/perl/perl-Unicode-Map8/perl-Unicode-Map8.SlackBuild @@ -80,6 +80,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p0 < $i ; done + CFLAGS="$SLKCFLAGS" \ perl Makefile.PL \ PREFIX=/usr \ diff --git a/perl/perl-tk/patches/01_perl-Tk-widget.patch b/perl/perl-tk/patches/01_perl-Tk-widget.patch new file mode 100644 index 0000000000..974e761428 --- /dev/null +++ b/perl/perl-tk/patches/01_perl-Tk-widget.patch @@ -0,0 +1,26 @@ +--- ./demos/widget.orig 2008-01-02 13:24:14.000000000 +0100 ++++ ./demos/widget 2008-01-02 13:27:10.000000000 +0100 +@@ -3,7 +3,8 @@ + use 5.008; + use Config; + use Tk 804.000; +-use lib Tk->findINC( 'demos/widget_lib' ); ++#use lib Tk->findINC( 'demos/widget_lib' ); ++use lib "@demopath@/widget_lib"; + use Tk::widgets qw/ DialogBox ErrorDialog LabEntry ROText /; + use Tk::Config (); + use WidgetDemo; +@@ -62,9 +63,11 @@ + $l->destroy; + } + +-my $widget_lib = Tk->findINC('demos/widget_lib'); ++#my $widget_lib = Tk->findINC('demos/widget_lib'); ++my $widget_lib = "@demopath@/widget_lib"; + my $wd = "$widget_lib/WidgetDemo.pm"; +-$WIDTRIB = Tk->findINC('demos/widtrib'); ++#$WIDTRIB = Tk->findINC('demos/widtrib'); ++$WIDTRIB = "@demopath@/widtrib"; + unless (Tk::tainting) { + $WIDTRIB = $ENV{WIDTRIB} if defined $ENV{WIDTRIB}; + $WIDTRIB = $ARGV[0] if defined $ARGV[0]; diff --git a/perl/perl-tk/patches/02_perl-Tk-debian.patch b/perl/perl-tk/patches/02_perl-Tk-debian.patch new file mode 100644 index 0000000000..6b945b4b15 --- /dev/null +++ b/perl/perl-tk/patches/02_perl-Tk-debian.patch @@ -0,0 +1,71 @@ +--- perl-tk-804.027.orig/objGlue.c ++++ perl-tk-804.027/objGlue.c +@@ -529,6 +529,10 @@ + sv_utf8_upgrade(objPtr); + #endif + s = SvPV(objPtr, len); ++ if (!s) ++ { ++ return NULL; ++ } + #ifdef SvUTF8 + if (!is_utf8_string(s,len)) + { +@@ -555,6 +559,10 @@ + else + { + s = LangString(objPtr); ++ if (!s) ++ { ++ return NULL; ++ } + #ifdef SvUTF8 + if (!is_utf8_string(s,strlen(s))) + { +--- perl-tk-804.027.orig/pTk/mTk/generic/tkFont.c ++++ perl-tk-804.027/pTk/mTk/generic/tkFont.c +@@ -1044,6 +1044,7 @@ + TkFont *fontPtr, *firstFontPtr, *oldFontPtr; + int new, descent; + NamedFont *nfPtr; ++ char *fontString; + + fiPtr = ((TkWindow *) tkwin)->mainPtr->fontInfoPtr; + if (objPtr->typePtr != &tkFontObjType) { +@@ -1077,8 +1078,12 @@ + cacheHashPtr = oldFontPtr->cacheHashPtr; + FreeFontObjProc(objPtr); + } else { ++ fontString = Tcl_GetString(objPtr); ++ if (fontString == NULL) { ++ fontString = ""; ++ } + cacheHashPtr = Tcl_CreateHashEntry(&fiPtr->fontCache, +- Tcl_GetString(objPtr), &new); ++ fontString, &new); + } + firstFontPtr = (TkFont *) Tcl_GetHashValue(cacheHashPtr); + for (fontPtr = firstFontPtr; (fontPtr != NULL); +@@ -1095,8 +1100,12 @@ + * The desired font isn't in the table. Make a new one. + */ + ++ fontString = Tcl_GetString(objPtr); ++ if (fontString == NULL) { ++ fontString = ""; ++ } + namedHashPtr = Tcl_FindHashEntry(&fiPtr->namedTable, +- Tcl_GetString(objPtr)); ++ fontString); + if (namedHashPtr != NULL) { + /* + * Construct a font based on a named font. +@@ -1111,7 +1120,7 @@ + * Native font? + */ + +- fontPtr = TkpGetNativeFont(tkwin, Tcl_GetString(objPtr)); ++ fontPtr = TkpGetNativeFont(tkwin, fontString); + if (fontPtr == NULL) { + TkFontAttributes fa; + Tcl_Obj *dupObjPtr = Tcl_DuplicateObj(objPtr); diff --git a/perl/perl-tk/patches/03_perl-Tk-seg.patch b/perl/perl-tk/patches/03_perl-Tk-seg.patch new file mode 100644 index 0000000000..26201fa3a3 --- /dev/null +++ b/perl/perl-tk/patches/03_perl-Tk-seg.patch @@ -0,0 +1,33 @@ +diff -up Tk-804.028/pTk/mTk/generic/tkConfig.c.seg Tk-804.028/pTk/mTk/generic/tkConfig.c +--- Tk-804.028/pTk/mTk/generic/tkConfig.c.seg 2008-03-11 23:29:39.000000000 -0400 ++++ Tk-804.028/pTk/mTk/generic/tkConfig.c 2008-03-11 23:28:09.000000000 -0400 +@@ -1210,11 +1210,11 @@ GetOptionFromObj(interp, objPtr, tablePt + * First, check to see if the object already has the answer cached. + */ + +- if (objPtr->typePtr == &tkOptionObjType) { ++/* if (objPtr->typePtr == &tkOptionObjType) { + if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) { + return (Option *) objPtr->internalRep.twoPtrValue.ptr2; + } +- } ++ }*/ + + /* + * The answer isn't cached. +@@ -2277,9 +2277,15 @@ Tk_GetOptionValue(interp, recordPtr, opt + if (optionPtr == NULL) { + return NULL; + } ++ ++ if (optionPtr->specPtr == NULL) { ++ return NULL; ++ } ++ + if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) { + optionPtr = optionPtr->extra.synonymPtr; + } ++ + if (optionPtr->specPtr->objOffset >= 0) { + resultPtr = *((Tcl_Obj **) (recordPtr + optionPtr->specPtr->objOffset)); + if (resultPtr == NULL) { diff --git a/perl/perl-tk/patches/04_perl-Tk-c99.patch b/perl/perl-tk/patches/04_perl-Tk-c99.patch new file mode 100644 index 0000000000..2db1e17f1e --- /dev/null +++ b/perl/perl-tk/patches/04_perl-Tk-c99.patch @@ -0,0 +1,81 @@ +Avoid implicit ints and implicit function declarations. These +language features have been removed from C in 1999. Future compilers +are likely to stop accepting these constructs by default. + +Submitted upstream: + +diff -ur Tk-804.036.orig/config/signedchar.c Tk-804.036/config/signedchar.c +--- Tk-804.036.orig/config/signedchar.c 2023-02-24 10:48:08.060779006 +0100 ++++ Tk-804.036/config/signedchar.c 2023-02-24 10:48:58.315268904 +0100 +@@ -1,4 +1,4 @@ +-main() ++int main(void) + { + signed char x = 'a'; + return (x - 'a'); +diff -ur Tk-804.036.orig/config/unsigned.c Tk-804.036/config/unsigned.c +--- Tk-804.036.orig/config/unsigned.c 2023-02-24 10:48:08.054779067 +0100 ++++ Tk-804.036/config/unsigned.c 2023-02-24 10:49:27.580971854 +0100 +@@ -1,15 +1,16 @@ ++#include + int main() + { + char x[] = "\377"; + if (x[0] > 0) + { + printf("char is unsigned type\n"); +- exit(0); ++ return 0; + } + else + { + printf("char is signed type\n"); +- exit(1); ++ return 1; + } + } + +diff -ur Tk-804.036.orig/pTk/config/Hstrdup.c Tk-804.036/pTk/config/Hstrdup.c +--- Tk-804.036.orig/pTk/config/Hstrdup.c 2023-02-24 10:48:08.010779514 +0100 ++++ Tk-804.036/pTk/config/Hstrdup.c 2023-02-24 10:53:04.326771841 +0100 +@@ -6,7 +6,7 @@ + {char *e; + char *p = strdup(STRING); + if (!p || strcmp(p,STRING)) +- exit(1); ++ return 1; + return 0; + } + +diff -ur Tk-804.036.orig/pTk/config/Hstrtoul.c Tk-804.036/pTk/config/Hstrtoul.c +--- Tk-804.036.orig/pTk/config/Hstrtoul.c 2023-02-24 10:48:08.013779483 +0100 ++++ Tk-804.036/pTk/config/Hstrtoul.c 2023-02-24 10:50:13.205508745 +0100 +@@ -1,4 +1,5 @@ + #include ++#include + + int main() + {char *e; +diff -ur Tk-804.036.orig/pTk/mTk/generic/tkEvent.c Tk-804.036/pTk/mTk/generic/tkEvent.c +--- Tk-804.036.orig/pTk/mTk/generic/tkEvent.c 2023-02-24 10:48:07.324786476 +0100 ++++ Tk-804.036/pTk/mTk/generic/tkEvent.c 2023-02-24 10:54:20.859995000 +0100 +@@ -1153,6 +1153,7 @@ + Time + TkCurrentTime(dispPtr, fallbackCurrent) + TkDisplay *dispPtr; /* Display for which the time is desired. */ ++ int fallbackCurrent; + { + register XEvent *eventPtr; + ThreadSpecificData *tsdPtr = (ThreadSpecificData *) +diff -ur Tk-804.036.orig/pTk/mTk/generic/tkImage.c Tk-804.036/pTk/mTk/generic/tkImage.c +--- Tk-804.036.orig/pTk/mTk/generic/tkImage.c 2023-02-24 10:48:07.321786507 +0100 ++++ Tk-804.036/pTk/mTk/generic/tkImage.c 2023-02-24 10:55:56.174027554 +0100 +@@ -1083,6 +1083,8 @@ + int y; + int width; + int height; ++int imgWidth; ++int imgHeight; + { + Tk_Tile tile = (Tk_Tile) clientData; + Tk_TileChange *handler; diff --git a/perl/perl-tk/patches/05_perl-Tk-Fix-STRLEN-vs-int-pointer-confusion-in-Tcl_GetByteAr.patch b/perl/perl-tk/patches/05_perl-Tk-Fix-STRLEN-vs-int-pointer-confusion-in-Tcl_GetByteAr.patch new file mode 100644 index 0000000000..1935073525 --- /dev/null +++ b/perl/perl-tk/patches/05_perl-Tk-Fix-STRLEN-vs-int-pointer-confusion-in-Tcl_GetByteAr.patch @@ -0,0 +1,45 @@ +From a26233c844c52f49ef9cca5f88dd9063aac60d0f Mon Sep 17 00:00:00 2001 +From: Niko Tyni +Date: Thu, 11 Jan 2024 18:28:58 +0000 +Subject: [PATCH] Fix STRLEN vs int pointer confusion in + Tcl_GetByteArrayFromObj() + +Perl 5.37.2, more precisely commit + + https://github.com/Perl/perl5/commit/1ef9039bccbfe64f47f201b6cfb7d6d23e0b08a7 + +changed the implementation of SvPV() et al., breaking t/balloon.t, +t/canvas2.t and t/photo.t on big-endian 64-bit architectures such as +ppc64 and s390x because StringMatchGIF() no longer recognized GIF files. + +This is because Tcl_GetByteArrayFromObj() was calling SvPV() with an int +pointer instead of a correct STRLEN pointer, and the new implementation +is more sensitive to this: it assigns the pointers as-is, resulting in +the int pointer pointing at the wrong end of the 64-bit length. + +Other functions taking a length pointer, at least Tcl_GetStringFromObj() +already seem to do things correctly, so presumably this is not a +systematic issue. +--- + objGlue.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/objGlue.c b/objGlue.c +index d4927ea..dbd6a50 100644 +--- a/objGlue.c ++++ b/objGlue.c +@@ -627,7 +627,10 @@ Tcl_GetByteArrayFromObj(Tcl_Obj * objPtr, int * lengthPtr) + sv_utf8_downgrade(objPtr, 0); + if (lengthPtr) + { +- return (unsigned char *) SvPV(objPtr, *lengthPtr); ++ STRLEN len; ++ unsigned char *s = SvPV(objPtr, len); ++ *lengthPtr = len; ++ return s; + } + else + { +-- +2.30.2 + diff --git a/perl/perl-tk/patches/06_perl-Tk-Fix-build-with-clang-16.patch b/perl/perl-tk/patches/06_perl-Tk-Fix-build-with-clang-16.patch new file mode 100644 index 0000000000..79531f6095 --- /dev/null +++ b/perl/perl-tk/patches/06_perl-Tk-Fix-build-with-clang-16.patch @@ -0,0 +1,746 @@ + + + + + + Tree - rpms/perl-Tk - src.fedoraproject.org + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+
+
+

+

+
+
+

+rpms / perl-Tk +

+
+
+
+
+
+
+ + + Clone + +
+
+
+
Source Code
+ +
+
+
GIT
+ +
+
+
+
+
+ +
+
+
+
+ + +
+
+ +
+ +
+
+
+
+
+
+

+ Files +

+
+ +
+
+ +
+ + el4 + + + el5 + + + el6 + + + f10 + + + f11 + + + f12 + + + f13 + + + f14 + + + f15 + + + f16 + + + f17 + + + f18 + + + f19 + + + f20 + + + f21 + + + f22 + + + f23 + + + f24 + + + f25 + + + f26 + + + f27 + + + f28 + + + f29 + + + f30 + + + f31 + + + f32 + + + f33 + + + f34 + + + f35 + + + f36 + + + f37 + + + f38 + + + f39 + + + f40 + + + f7 + + + f8 + + + f9 + + + fc6 + + + main + + + rawhide + +
+
+
+
+ +
+
+
    +
  1. + + +   rawhide + +
    2. +
  2. + +   perl-Tk-Fix-build-with-clang-16.patch +
    3. +
+
+ +
+
+
+ + +
+ + Blob + + Blame + + History + + Raw +
+ + 
diff -up Tk-804.036/pTk/Xlib.t.orig Tk-804.036/pTk/Xlib.t
+--- Tk-804.036/pTk/Xlib.t.orig	2024-02-15 10:07:51.542657507 +0100
++++ Tk-804.036/pTk/Xlib.t	2024-02-15 10:08:51.500167194 +0100
+@@ -331,7 +331,7 @@ VFUNC(int,XIntersectRegion,V_XIntersectR
+ #endif /* !DO_X_EXCLUDE */
+ 
+ #ifndef XKeycodeToKeysym
+-VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, unsigned int, int)))
++VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, KeyCode, int)))
+ #endif /* #ifndef XKeycodeToKeysym */
+ 
+ #ifndef XKeysymToString
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
Powered by Pagure 5.14.1
+ +
+
+
© Red Hat, Inc. and others.
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/perl/perl-tk/patches/07_perl-Tk-pregcomp2.c-Avoid-using-incompatible-pointer-type.patch b/perl/perl-tk/patches/07_perl-Tk-pregcomp2.c-Avoid-using-incompatible-pointer-type.patch new file mode 100644 index 0000000000..9a493eaa79 --- /dev/null +++ b/perl/perl-tk/patches/07_perl-Tk-pregcomp2.c-Avoid-using-incompatible-pointer-type.patch @@ -0,0 +1,24 @@ +From 5c646b1cc55e18648918f101961afd1589a58168 Mon Sep 17 00:00:00 2001 +From: Christopher Chavez +Date: Mon, 19 Feb 2024 13:50:44 -0600 +Subject: [PATCH] pregcomp2.c: Avoid using incompatible pointer type + +See https://github.com/eserte/perl-tk/issues/98#issuecomment-1948125587 +--- + config/pregcomp2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/pregcomp2.c b/config/pregcomp2.c +index 98506999..bb0b4539 100644 +--- a/config/pregcomp2.c ++++ b/config/pregcomp2.c +@@ -4,5 +4,5 @@ + + int main() { + SV* sv = newSViv(0); +- regexp* rx = pregcomp(sv, 0); ++ void* rx = pregcomp(sv, 0); + } +-- +2.43.0 + diff --git a/perl/perl-tk/patches/08_perl-Tk-Avoid-using-incompatible-pointer-type-for-old_warn.patch b/perl/perl-tk/patches/08_perl-Tk-Avoid-using-incompatible-pointer-type-for-old_warn.patch new file mode 100644 index 0000000000..791ae3c61a --- /dev/null +++ b/perl/perl-tk/patches/08_perl-Tk-Avoid-using-incompatible-pointer-type-for-old_warn.patch @@ -0,0 +1,30 @@ +diff -Naur Tk-804.036/Event/Event.xs Tk-804.036.new/Event/Event.xs +--- Tk-804.036/Event/Event.xs 2021-02-07 17:34:03.000000000 +0100 ++++ Tk-804.036.new/Event/Event.xs 2024-06-14 21:23:55.743817569 +0200 +@@ -1532,7 +1532,7 @@ + BOOT: + { + #ifdef pWARN_NONE +- SV *old_warn = PL_curcop->cop_warnings; ++ void *old_warn = PL_curcop->cop_warnings; + PL_curcop->cop_warnings = pWARN_NONE; + #endif + newXS("Tk::Event::INIT", XS_Tk__Event_INIT, file); +diff -Naur Tk-804.036/tkGlue.c Tk-804.036.new/tkGlue.c +--- Tk-804.036/tkGlue.c 2021-02-07 17:34:04.000000000 +0100 ++++ Tk-804.036.new/tkGlue.c 2024-06-14 21:25:08.742817569 +0200 +@@ -5543,13 +5543,8 @@ + char *XEventMethods = "abcdfhkmopstvwxyABDEKNRSTWXY#"; + char buf[128]; + CV *cv; +-#if PERL_REVISION > 5 || (PERL_REVISION == 5 && PERL_VERSION >= 9) +-#define COP_WARNINGS_TYPE STRLEN* +-#else +-#define COP_WARNINGS_TYPE SV* +-#endif + #ifdef pWARN_NONE +- COP_WARNINGS_TYPE old_warn = PL_curcop->cop_warnings; ++ void *old_warn = PL_curcop->cop_warnings; + PL_curcop->cop_warnings = pWARN_NONE; + #endif + diff --git a/perl/perl-tk/patches/09_perl-Tk-Fix-incompatible-pointer-type-in-function-GetTextIndex.patch b/perl/perl-tk/patches/09_perl-Tk-Fix-incompatible-pointer-type-in-function-GetTextIndex.patch new file mode 100644 index 0000000000..d90f76c544 --- /dev/null +++ b/perl/perl-tk/patches/09_perl-Tk-Fix-incompatible-pointer-type-in-function-GetTextIndex.patch @@ -0,0 +1,746 @@ + + + + + + Tree - rpms/perl-Tk - src.fedoraproject.org + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+
+
+

+

+
+
+

+rpms / perl-Tk +

+
+
+
+
+
+
+ + + Clone + +
+
+
+
Source Code
+ +
+
+
GIT
+ +
+
+
+
+
+ +
+
+
+
+ + +
+
+ +
+ +
+
+
+
+
+
+

+ Files +

+
+ +
+
+ +
+ + el4 + + + el5 + + + el6 + + + f10 + + + f11 + + + f12 + + + f13 + + + f14 + + + f15 + + + f16 + + + f17 + + + f18 + + + f19 + + + f20 + + + f21 + + + f22 + + + f23 + + + f24 + + + f25 + + + f26 + + + f27 + + + f28 + + + f29 + + + f30 + + + f31 + + + f32 + + + f33 + + + f34 + + + f35 + + + f36 + + + f37 + + + f38 + + + f39 + + + f40 + + + f7 + + + f8 + + + f9 + + + fc6 + + + main + + + rawhide + +
+
+
+
+ +
+
+
    +
  1. + + +   rawhide + +
    2. +
  2. + +   perl-Tk-Fix-incompatible-pointer-type-in-function-GetTextIndex.patch +
    3. +
+
+ +
+
+
+ + +
+ + Blob + + Blame + + History + + Raw +
+ + 
diff -up Tk-804.036/pTk/mTk/generic/tkCanvText.c.orig Tk-804.036/pTk/mTk/generic/tkCanvText.c
+--- Tk-804.036/pTk/mTk/generic/tkCanvText.c.orig	2024-02-16 13:50:00.966946199 +0100
++++ Tk-804.036/pTk/mTk/generic/tkCanvText.c	2024-02-16 13:50:26.060152547 +0100
+@@ -1234,7 +1234,7 @@ GetTextIndex(interp, canvas, itemPtr, ob
+ 				 * index. */
+ {
+     TextItem *textPtr = (TextItem *) itemPtr;
+-    size_t length;
++    int length;
+     int c;
+     TkCanvas *canvasPtr = (TkCanvas *) canvas;
+     Tk_CanvasTextInfo *textInfoPtr = textPtr->textInfoPtr;
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
Powered by Pagure 5.14.1
+ +
+
+
© Red Hat, Inc. and others.
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/perl/perl-tk/perl-tk.SlackBuild b/perl/perl-tk/perl-tk.SlackBuild index 7cce2e57ba..9191f0b034 100644 --- a/perl/perl-tk/perl-tk.SlackBuild +++ b/perl/perl-tk/perl-tk.SlackBuild @@ -83,6 +83,7 @@ find -L . \ # Apply a few patches patch -p0 < $CWD/perl_bin_path.diff +for i in $CWD/patches/* ; do patch -p1 < $i ; done # XFT=1 (font manager) support, which gives perl-tk programs the ability to # use all fonts accessible from XFT and antialiasing. @@ -91,6 +92,9 @@ perl Makefile.PL \ INSTALLDIRS=vendor \ INSTALLVENDORMAN1DIR=/usr/man/man1 \ INSTALLVENDORMAN3DIR=/usr/man/man3 \ + +find . -name Makefile | xargs perl -pi -e 's/$/ -std=gnu99/ if /^CCFLAGS/;s/^\tLD_RUN_PATH=[^\s]+\s*/\t/' + make OPTIMIZE="$SLKCFLAGS" make install DESTDIR=$PKG diff --git a/python/alabaster/README b/python/alabaster/README deleted file mode 100644 index 596320ef6e..0000000000 --- a/python/alabaster/README +++ /dev/null @@ -1,13 +0,0 @@ -A configurable sidebar-enabled Sphinx theme - -Alabaster is a visually (c)lean, responsive, configurable theme -for the Sphinx documentation system. It is Python 2+3 compatible. - -It began as a third-party theme, and is still maintained separately, -but as of Sphinx 1.3, Alabaster is an install-time dependency -of Sphinx and is selected as the default theme. - -Live examples of this theme can be seen on this project's own -website, paramiko.org, fabfile.org and pyinvoke.org. - -For more documentation, please see http://alabaster.readthedocs.io. diff --git a/python/alabaster/alabaster.SlackBuild b/python/alabaster/alabaster.SlackBuild deleted file mode 100644 index ffc51ad38c..0000000000 --- a/python/alabaster/alabaster.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - -# Slackware build script for alabaster - -# Copyright 2017 Nikos Giotis -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Update 2023-11-25: Removed python2 support - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=alabaster -VERSION=${VERSION:-0.7.13} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/alabaster/alabaster.info b/python/alabaster/alabaster.info deleted file mode 100644 index 169e58e1b5..0000000000 --- a/python/alabaster/alabaster.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="alabaster" -VERSION="0.7.13" -HOMEPAGE="https://alabaster.readthedocs.io/" -DOWNLOAD="https://files.pythonhosted.org/packages/94/71/a8ee96d1fd95ca04a0d2e2d9c4081dac4c2d2b12f7ddb899c8cb9bfd1532/alabaster-0.7.13.tar.gz" -MD5SUM="2e05a5f4fe5a8b95e5e576cbf4a5d503" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Nikos Giotis" -EMAIL="nikos.giotis@gmail.com" diff --git a/python/alabaster/slack-desc b/python/alabaster/slack-desc deleted file mode 100644 index ac64dcfad2..0000000000 --- a/python/alabaster/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -alabaster: alabaster (A configurable sidebar-enabled Sphinx theme) -alabaster: -alabaster: Alabaster is a visually (c)lean, responsive, configurable theme for -alabaster: the Sphinx documentation system. It is Python 2+3 compatible. -alabaster: -alabaster: https://alabaster.readthedocs.io/ -alabaster: -alabaster: -alabaster: -alabaster: -alabaster: diff --git a/python/gi-docgen/README b/python/gi-docgen/README deleted file mode 100644 index 0b1edcc084..0000000000 --- a/python/gi-docgen/README +++ /dev/null @@ -1,5 +0,0 @@ -GI-DocGen is a document generator for GObject-based libraries. GObject -is the base type system of the GNOME project. GI-Docgen reuses the -introspection data generated by GObject-based libraries to generate the -API reference of these libraries, as well as other ancillary -documentation. diff --git a/python/gi-docgen/gi-docgen.SlackBuild b/python/gi-docgen/gi-docgen.SlackBuild deleted file mode 100644 index a6fc4d340a..0000000000 --- a/python/gi-docgen/gi-docgen.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash - -# Slackware build script for gi-docgen - -# Copyright 2022-2023 Steven Voges -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=gi-docgen -VERSION=${VERSION:-2023.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python3 setup.py install --root=$PKG -mv $PKG/usr/share/man $PKG/usr/man - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.md LICENSES/*.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 diff --git a/python/gi-docgen/gi-docgen.info b/python/gi-docgen/gi-docgen.info deleted file mode 100644 index 7dba9e14f1..0000000000 --- a/python/gi-docgen/gi-docgen.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gi-docgen" -VERSION="2023.1" -HOMEPAGE="https://gnome.pages.gitlab.gnome.org/gi-docgen" -DOWNLOAD="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/2023.1/gi-docgen-2023.1.tar.gz" -MD5SUM="844e84610246501d3303ae9150d0cc24" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-toml python3-typogrify" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/python/gi-docgen/slack-desc b/python/gi-docgen/slack-desc deleted file mode 100644 index 14f602d26d..0000000000 --- a/python/gi-docgen/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gi-docgen: gi-docgen (Document Generator) -gi-docgen: -gi-docgen: GI-DocGen is a document generator for GObject-based libraries. -gi-docgen: -gi-docgen: Homepage: https://gnome.pages.gitlab.gnome.org/gi-docgen -gi-docgen: -gi-docgen: -gi-docgen: -gi-docgen: -gi-docgen: -gi-docgen: diff --git a/python/gst-python/gst-python.SlackBuild b/python/gst-python/gst-python.SlackBuild index 8add0166ae..805527f8c2 100644 --- a/python/gst-python/gst-python.SlackBuild +++ b/python/gst-python/gst-python.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gst-python -VERSION=${VERSION:-1.18.5} +VERSION=${VERSION:-1.24.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -101,7 +101,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog NEWS RELEASE README TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING ChangeLog NEWS RELEASE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/gst-python/gst-python.info b/python/gst-python/gst-python.info index 27d2f54095..f25ce65561 100644 --- a/python/gst-python/gst-python.info +++ b/python/gst-python/gst-python.info @@ -1,8 +1,8 @@ PRGNAM="gst-python" -VERSION="1.18.5" +VERSION="1.24.1" HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-python.html" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz" -MD5SUM="eb19229f72f61506e33182a6fbce4a2e" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.24.1.tar.xz" +MD5SUM="a04bf7cfc76de2096d2dfd9feb12ddba" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/imagesize/imagesize.SlackBuild b/python/imagesize/imagesize.SlackBuild index bf2370fa93..9d860915b6 100644 --- a/python/imagesize/imagesize.SlackBuild +++ b/python/imagesize/imagesize.SlackBuild @@ -81,10 +81,6 @@ find -L . \ python setup.py install --root=$PKG -if python3 -c 'import sys' 2>/dev/null; then - python3 setup.py install --root=$PKG -fi - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/numexpr/numexpr.SlackBuild b/python/numexpr/numexpr.SlackBuild index 4777568813..25e4eab805 100644 --- a/python/numexpr/numexpr.SlackBuild +++ b/python/numexpr/numexpr.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=numexpr -VERSION=${VERSION:-2.8.7} +VERSION=${VERSION:-2.10.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,7 +80,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 {} \; -python3 setup.py install --root=$PKG +python3 -m build --no-isolation +python3 -m installer -d "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/numexpr/numexpr.info b/python/numexpr/numexpr.info index bb4648f5f0..ec87334f53 100644 --- a/python/numexpr/numexpr.info +++ b/python/numexpr/numexpr.info @@ -1,8 +1,8 @@ PRGNAM="numexpr" -VERSION="2.8.7" +VERSION="2.10.2" HOMEPAGE="https://github.com/pydata/numexpr" -DOWNLOAD="https://pypi.python.org/packages/source/n/numexpr/numexpr-2.8.7.tar.gz" -MD5SUM="ba042bd8e8fa3d5ca400e734f32c1b31" +DOWNLOAD="https://pypi.python.org/packages/source/n/numexpr/numexpr-2.10.2.tar.gz" +MD5SUM="2980f95e0dde55c31c0749ddfbadd8f2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-numpy" diff --git a/python/pikepdf/pikepdf.SlackBuild b/python/pikepdf/pikepdf.SlackBuild index ffd52a04d8..ff201dfdb7 100644 --- a/python/pikepdf/pikepdf.SlackBuild +++ b/python/pikepdf/pikepdf.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pikepdf -VERSION=${VERSION:-5.3.2} +VERSION=${VERSION:-6.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/pikepdf/pikepdf.info b/python/pikepdf/pikepdf.info index 841168a293..d5376e1eea 100644 --- a/python/pikepdf/pikepdf.info +++ b/python/pikepdf/pikepdf.info @@ -1,8 +1,8 @@ PRGNAM="pikepdf" -VERSION="5.3.2" +VERSION="6.0.1" HOMEPAGE="https://github.com/pikepdf/pikepdf" -DOWNLOAD="https://pypi.python.org/packages/source/p/pikepdf/pikepdf-5.3.2.tar.gz" -MD5SUM="367ed61eeff72e190c58eb8bc1f882a7" +DOWNLOAD="https://pypi.python.org/packages/source/p/pikepdf/pikepdf-6.0.1.tar.gz" +MD5SUM="38b50358ea6c38212dc99bd6944e165c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-lxml pybind11 python3-deprecation python3-setuptools_scm_git_archive" diff --git a/python/pybind11/pybind11.SlackBuild b/python/pybind11/pybind11.SlackBuild index 7e5113c3af..54ef8e01e9 100644 --- a/python/pybind11/pybind11.SlackBuild +++ b/python/pybind11/pybind11.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pybind11 -VERSION=${VERSION:-2.11.1} +VERSION=${VERSION:-2.13.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/pybind11/pybind11.info b/python/pybind11/pybind11.info index 7df93613c6..bf55b269d3 100644 --- a/python/pybind11/pybind11.info +++ b/python/pybind11/pybind11.info @@ -1,8 +1,8 @@ PRGNAM="pybind11" -VERSION="2.11.1" +VERSION="2.13.6" HOMEPAGE="https://github.com/pybind/pybind11" -DOWNLOAD="https://github.com/pybind/pybind11/archive/v2.11.1/pybind11-2.11.1.tar.gz" -MD5SUM="49e92f92244021912a56935918c927d0" +DOWNLOAD="https://github.com/pybind/pybind11/archive/v2.13.6/pybind11-2.13.6.tar.gz" +MD5SUM="a04dead9c83edae6d84e2e343da7feeb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/pygsl/pygsl.SlackBuild b/python/pygsl/pygsl.SlackBuild index cd88438355..68d79d23d7 100644 --- a/python/pygsl/pygsl.SlackBuild +++ b/python/pygsl/pygsl.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pygsl -VERSION=${VERSION:-2.5.1} +VERSION=${VERSION:-2.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -51,20 +51,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG @@ -80,25 +66,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py gsl_wrappers -python3 setup.py config -python3 setup.py build -python3 setup.py install --root=$PKG +python3 -m build --wheel --no-isolation +python3 -m installer -d "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# I am not sure if the build produces these "UNKNOWN" folders in all systems -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -if [ -d $PKG/usr/include/python$PYVER/UNKNOWN ]; then - mkdir -p $PKG/usr/include/python$PYVER/$PRGNAM - mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/python$PYVER/site-packages/$PRGNAM-$VERSION-py$PYVER.egg-info - mv $PKG/usr/include/python$PYVER/UNKNOWN/* $PKG/usr/include/python$PYVER/$PRGNAM - mv $PKG/usr/lib$LIBDIRSUFFIX/python$PYVER/site-packages/UNKNOWN-0.0.0-py$PYVER.egg-info/* $PKG/usr/lib$LIBDIRSUFFIX/python$PYVER/site-packages/$PRGNAM-$VERSION-py$PYVER.egg-info - rmdir $PKG/usr/include/python$PYVER/UNKNOWN - rmdir $PKG/usr/lib$LIBDIRSUFFIX/python$PYVER/site-packages/UNKNOWN-0.0.0-py$PYVER.egg-info -fi - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ ChangeLog COPYING CREDITS.rst README.rst TODO.rst \ diff --git a/python/pygsl/pygsl.info b/python/pygsl/pygsl.info index c4d0b37bcb..a13331a6b2 100644 --- a/python/pygsl/pygsl.info +++ b/python/pygsl/pygsl.info @@ -1,8 +1,8 @@ PRGNAM="pygsl" -VERSION="2.5.1" +VERSION="2.6.2" HOMEPAGE="https://github.com/pygsl/pygsl/" -DOWNLOAD="https://github.com/pygsl/pygsl/archive/refs/tags/v2.5.1/pygsl-2.5.1.tar.gz" -MD5SUM="8b1689b8cc20955a8a6516255fd59df9" +DOWNLOAD="https://github.com/pygsl/pygsl/archive/refs/tags/v2.6.2/pygsl-2.6.2.tar.gz" +MD5SUM="525af24b404a47d1e3dde96fdc102863" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-numpy" diff --git a/python/python-importlib_metadata/README b/python/python-importlib_metadata/README deleted file mode 100644 index 628ad7454d..0000000000 --- a/python/python-importlib_metadata/README +++ /dev/null @@ -1,4 +0,0 @@ -importlib_metadata is a library which provides an API for accessing -an installed package's metadata, such as its entry points or its -top-level name. This functionality intends to replace most uses of -pkg_resources entry point API and metadata API. diff --git a/python/python-importlib_metadata/python-importlib_metadata.SlackBuild b/python/python-importlib_metadata/python-importlib_metadata.SlackBuild deleted file mode 100644 index 264b8ee359..0000000000 --- a/python/python-importlib_metadata/python-importlib_metadata.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Slackware build script for python-importlib_metadata - -# Copyright 2023-2025 fourtysixandtwo -# Copyright 2019-2020 Benjamin Trigona-Harany -# Copyright 2022 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python-importlib_metadata -VERSION=${VERSION:-8.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCNAM=importlib_metadata - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages/ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python-importlib_metadata/python-importlib_metadata.info b/python/python-importlib_metadata/python-importlib_metadata.info deleted file mode 100644 index 818482706f..0000000000 --- a/python/python-importlib_metadata/python-importlib_metadata.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python-importlib_metadata" -VERSION="8.7.0" -HOMEPAGE="https://importlib-metadata.readthedocs.io/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-8.7.0.tar.gz" -MD5SUM="4be81d3e32fd72eac56559be49ccb920" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python-zipp" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python-importlib_metadata/slack-desc b/python/python-importlib_metadata/slack-desc deleted file mode 100644 index a14e1318e8..0000000000 --- a/python/python-importlib_metadata/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python-importlib_metadata: python-importlib_metadata (Python package metadata) -python-importlib_metadata: -python-importlib_metadata: importlib_metadata is a library which provides an API for accessing -python-importlib_metadata: an installed package's metadata, such as its entry points or its -python-importlib_metadata: top-level name. This functionality intends to replace most uses of -python-importlib_metadata: pkg_resources entry point API and metadata API. -python-importlib_metadata: -python-importlib_metadata: -python-importlib_metadata: -python-importlib_metadata: -python-importlib_metadata: diff --git a/python/python-pcapy/python-pcapy.SlackBuild b/python/python-pcapy/python-pcapy.SlackBuild index fd1bd93670..eafdadf75e 100644 --- a/python/python-pcapy/python-pcapy.SlackBuild +++ b/python/python-pcapy/python-pcapy.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python-pcapy -SRCNAM=pcapy -VERSION=${VERSION:-0.11.4} +SRCNAM=pcapy-ng +VERSION=${VERSION:-1.0.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python-pcapy/python-pcapy.info b/python/python-pcapy/python-pcapy.info index abea62f2a2..3956daa295 100644 --- a/python/python-pcapy/python-pcapy.info +++ b/python/python-pcapy/python-pcapy.info @@ -1,8 +1,8 @@ PRGNAM="python-pcapy" -VERSION="0.11.4" +VERSION="1.0.9" HOMEPAGE="https://www.coresecurity.com/corelabs-research/open-source-tools/pcapy" -DOWNLOAD="https://github.com/CoreSecurity/pcapy/archive/0.11.4/pcapy-0.11.4.tar.gz" -MD5SUM="ccc0ece6114a095800c8764f85451677" +DOWNLOAD="https://github.com/stamparm/pcapy-ng/archive/1.0.9/pcapy-ng-1.0.9.tar.gz" +MD5SUM="5f17398bbe18c0679e0ed2d07c470a44" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python-smartypants/README b/python/python-smartypants/README deleted file mode 100644 index f91f30930a..0000000000 --- a/python/python-smartypants/README +++ /dev/null @@ -1,4 +0,0 @@ -smartypants.py is a Python fork of SmartyPants. - -Translate plain ASCII punctuation characters into "smart" typographic -punctuation HTML entities. diff --git a/python/python-smartypants/python-smartypants.SlackBuild b/python/python-smartypants/python-smartypants.SlackBuild deleted file mode 100644 index b52fc9fa0e..0000000000 --- a/python/python-smartypants/python-smartypants.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for python-smartypants - -# Copyright 2022 Steven Voges -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python-smartypants -SRCNAM=smartypants.py -VERSION=${VERSION:-2.0.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 {} \; - -python2 setup.py install --root=$PKG -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.rst COPYING docs/*.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python-smartypants/python-smartypants.info b/python/python-smartypants/python-smartypants.info deleted file mode 100644 index 6d5ce4d88c..0000000000 --- a/python/python-smartypants/python-smartypants.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python-smartypants" -VERSION="2.0.1" -HOMEPAGE="https://github.com/leohemsted/smartypants.py" -DOWNLOAD="https://github.com/leohemsted/smartypants.py/archive/v2.0.1/smartypants.py-2.0.1.tar.gz" -MD5SUM="27957540f4718e892039b2ed208c78f3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/python/python-smartypants/slack-desc b/python/python-smartypants/slack-desc deleted file mode 100644 index ac1deaef3a..0000000000 --- a/python/python-smartypants/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python-smartypants: python-smartypants (Smart Punctuation for Web Sites) -python-smartypants: -python-smartypants: Translate plain ASCII punctuation characters into "smart" typographic -python-smartypants: punctuation HTML entities. -python-smartypants: -python-smartypants: Homepage: https://github.com/leohemsted/smartypants.py -python-smartypants: -python-smartypants: -python-smartypants: -python-smartypants: -python-smartypants: diff --git a/python/python-zipp/README b/python/python-zipp/README deleted file mode 100644 index 6498203e6d..0000000000 --- a/python/python-zipp/README +++ /dev/null @@ -1,2 +0,0 @@ -A pathlib-compatible Zipfile object wrapper. A backport of the Path -object. diff --git a/python/python-zipp/python-zipp.SlackBuild b/python/python-zipp/python-zipp.SlackBuild deleted file mode 100644 index ecee0ef46a..0000000000 --- a/python/python-zipp/python-zipp.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -# Slackware build script for python-zipp - -# Copyright 2023-2024 fourtysixandtwo -# Copyright 2019-2020 Benjamin Trigona-Harany -# Copyright 2022 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python-zipp -VERSION=${VERSION:-3.21.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCNAM=zipp - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages/ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python-zipp/python-zipp.info b/python/python-zipp/python-zipp.info deleted file mode 100644 index 01881f7b89..0000000000 --- a/python/python-zipp/python-zipp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python-zipp" -VERSION="3.21.0" -HOMEPAGE="https://github.com/jaraco/zipp" -DOWNLOAD="https://files.pythonhosted.org/packages/source/z/zipp/zipp-3.21.0.tar.gz" -MD5SUM="a758089a5cbb8fab61d73c8ff345eee2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-setuptools-opt" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python-zipp/slack-desc b/python/python-zipp/slack-desc deleted file mode 100644 index 0445035132..0000000000 --- a/python/python-zipp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python-zipp: python-zipp (pathlib-compatible Zipfile object wrapper) -python-zipp: -python-zipp: A pathlib-compatible Zipfile object wrapper. A backport of the Path -python-zipp: object. -python-zipp: -python-zipp: -python-zipp: -python-zipp: -python-zipp: -python-zipp: -python-zipp: diff --git a/python/python2-lxml/python2-lxml.SlackBuild b/python/python2-lxml/python2-lxml.SlackBuild index f261a4dd12..aecd33f8e1 100644 --- a/python/python2-lxml/python2-lxml.SlackBuild +++ b/python/python2-lxml/python2-lxml.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python2-lxml SRCNAM=lxml -VERSION=${VERSION:-5.0.1} +VERSION=${VERSION:-5.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python2-lxml/python2-lxml.info b/python/python2-lxml/python2-lxml.info index d7c45799ce..72b64de2eb 100644 --- a/python/python2-lxml/python2-lxml.info +++ b/python/python2-lxml/python2-lxml.info @@ -1,8 +1,8 @@ PRGNAM="python2-lxml" -VERSION="5.0.1" +VERSION="5.0.2" HOMEPAGE="https://lxml.de/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/l/lxml/lxml-5.0.1.tar.gz" -MD5SUM="8e84d7819031fe29de3c321a2e376159" +DOWNLOAD="https://files.pythonhosted.org/packages/source/l/lxml/lxml-5.0.2.tar.gz" +MD5SUM="d6ad8a1b8a013f47e6614752a8164431" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python2-BeautifulSoup4 html5lib python2-cssselect" diff --git a/python/python2-pygame/python2-pygame.SlackBuild b/python/python2-pygame/python2-pygame.SlackBuild index 2370c48666..04af9c0c63 100644 --- a/python/python2-pygame/python2-pygame.SlackBuild +++ b/python/python2-pygame/python2-pygame.SlackBuild @@ -88,7 +88,7 @@ sed -i '/^if "install"/,$d' setup.py # Pygame version 2.0.3 is the last that supports python2 python2 -u buildconfig/config.py -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-incompatible-pointer-types" \ python2 setup.py install --root=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/python/python2-six/README b/python/python2-six/README new file mode 100644 index 0000000000..aca5ddefab --- /dev/null +++ b/python/python2-six/README @@ -0,0 +1,5 @@ +Six is a Python 2 and 3 compatibility library. It provides utility +functions for smoothing over the differences between the Python +versions with the goal of writing Python code that is compatible on +both Python versions. See the documentation for more information on +what is provided. diff --git a/python/python2-six/python2-six.SlackBuild b/python/python2-six/python2-six.SlackBuild new file mode 100644 index 0000000000..ed19e8034a --- /dev/null +++ b/python/python2-six/python2-six.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/bash + +# Slackware build script for python2-six + +# Copyright 2012-2018 Larry Hajali +# Copyright 2024 Arkadiusz Drabczyk +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=python2-six +SRCNAM=six +VERSION=${VERSION:-1.16.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +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 {} \; + +python2 setup.py install --root=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Build and install documentation if sphinx is installed. +if $(python -c 'import sphinx.pygments_styles' 2>/dev/null); then + make -j1 -C documentation man singlehtml + install -D -m 0644 documentation/_build/man/$SRCNAM.1 $PKG/usr/man/man1/$SRCNAM.1 + gzip -9 $PKG/usr/man/man?/*.? +fi + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION +[ -d documentation/_build/singlehtml ] && \ + cp -a documentation/_build/singlehtml/index.html \ + documentation/_build/singlehtml/_static \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +find $PKG/usr/doc -type f -exec chmod 0644 '{}' \; + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python2-six/python2-six.info b/python/python2-six/python2-six.info new file mode 100644 index 0000000000..89d425d977 --- /dev/null +++ b/python/python2-six/python2-six.info @@ -0,0 +1,10 @@ +PRGNAM="python2-six" +VERSION="1.16.0" +HOMEPAGE="https://pypi.python.org/pypi/six/" +DOWNLOAD="https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz" +MD5SUM="a7c927740e4964dd29b72cebfc1429bb" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Arkadiusz Drabczyk" +EMAIL="arkadiusz@drabczyk.org" diff --git a/python/python2-six/slack-desc b/python/python2-six/slack-desc new file mode 100644 index 0000000000..821615cd73 --- /dev/null +++ b/python/python2-six/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +python2-six: python2-six (Python 2 and 3 compatibility utilities) +python2-six: +python2-six: Six is a Python 2 and 3 compatibility library. It provides utility +python2-six: functions for smoothing over the differences between the Python +python2-six: versions with the goal of writing Python code that is compatible on +python2-six: both Python versions. See the documentation for more information on +python2-six: what is provided. +python2-six: +python2-six: Homepage: https://pypi.python.org/pypi/six/ +python2-six: +python2-six: diff --git a/python/python3-anyio/python3-anyio.info b/python/python3-anyio/python3-anyio.info index e38a35a843..58413515b4 100644 --- a/python/python3-anyio/python3-anyio.info +++ b/python/python3-anyio/python3-anyio.info @@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/source/a/anyio/anyio-4.11.0.ta MD5SUM="9bbd9262979f576a9023389e48204037" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-exceptiongroup python3-sniffio" +REQUIRES="python3-exceptiongroup python3-sniffio python3-typing-extensions" MAINTAINER="Jeremy Hansen" EMAIL="jebrhansen+SBo@gmail.com" diff --git a/python/python3-async-lru/python3-async-lru.info b/python/python3-async-lru/python3-async-lru.info index 600363e14c..d3e84e75b9 100644 --- a/python/python3-async-lru/python3-async-lru.info +++ b/python/python3-async-lru/python3-async-lru.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/aio-libs/async-lru/releases/download/v2.0.5/async_l MD5SUM="c972e8755626506ca019085e0620e192" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-typing-extensions" +REQUIRES="" MAINTAINER="Isaac Yu" EMAIL="isaacyu@protonmail.com" diff --git a/python/python3-babel/README b/python/python3-babel/README deleted file mode 100644 index 292ad0fb52..0000000000 --- a/python/python3-babel/README +++ /dev/null @@ -1,10 +0,0 @@ -babel (python internationalization tools) - -Babel is a collection of tools for internationalizing Python apps. -It's composed of two major parts: -- tools to build and work with gettext message catalogs; -- a Python interface to the CLDR (Common Locale Data Repository), - providing access to various locale display names, localized number - and date formatting, etc. - -The pytz dependency must be built with optional Python 3 support. diff --git a/python/python3-babel/python3-babel.SlackBuild b/python/python3-babel/python3-babel.SlackBuild deleted file mode 100644 index bfde1488cb..0000000000 --- a/python/python3-babel/python3-babel.SlackBuild +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-babel -# -# Copyright 2021 Yth | Pont-en-Royans, France | yth@ythogtha.org -# Copyright 2019-2021 Benjamin Trigona-Harany -# Copyright 2013-2018 Matteo Bernardini , Pisa, Italy -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-babel -VERSION=${VERSION:-2.17.0} -CLDRVER=${CLDRVER:-46.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCNAM=babel - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \; - -sed -i "s/getiterator/iter/" scripts/import_cldr.py # support Python 3.9 -sed -i "s/elem.getchildren()/list(elem)/" scripts/import_cldr.py # support Python 3.9 -ln -s $CWD/cldr-common-$CLDRVER.zip cldr/ -python3 setup.py import_cldr -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS* CHANGES* CONTRIBUTING* LICENSE* README* \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-babel/python3-babel.info b/python/python3-babel/python3-babel.info deleted file mode 100644 index fb698a733c..0000000000 --- a/python/python3-babel/python3-babel.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="python3-babel" -VERSION="2.17.0" -HOMEPAGE="http://babel.pocoo.org/" -DOWNLOAD="https://github.com/python-babel/babel/archive/v2.17.0/babel-2.17.0.tar.gz \ - http://unicode.org/Public/cldr/46/cldr-common-46.0.zip" -MD5SUM="8c6b6ca994d735b1247c2e5df2537ecf \ - 575f4779df738c09adb560c12b15f5a9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-pytz" -MAINTAINER="Yth - Arnaud" -EMAIL="yth@ythogtha.org" diff --git a/python/python3-babel/slack-desc b/python/python3-babel/slack-desc deleted file mode 100644 index 3da4910178..0000000000 --- a/python/python3-babel/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-babel: python3-babel (python internationalization tools) -python3-babel: -python3-babel: Babel is a collection of tools for internationalizing Python apps. -python3-babel: It's composed of two major parts: -python3-babel: - tools to build and work with gettext message catalogs; -python3-babel: - a Python interface to the CLDR (Common Locale Data Repository), -python3-babel: providing access to various locale display names, localized number -python3-babel: and date formatting, etc. -python3-babel: -python3-babel: homepage: http://babel.edgewall.org/ -python3-babel: diff --git a/python/python3-build/README b/python/python3-build/README deleted file mode 100644 index 204337b288..0000000000 --- a/python/python3-build/README +++ /dev/null @@ -1,9 +0,0 @@ -A simple, correct PEP517 package builder. - -NOTE: - Has a soft requirement for python-importlib_metadata (and python-zipp) - which should be installed as it fixes a stdlib bug, but newer versions - have a circular dep on this slackbuild so cannot be built before it. - Therefore it will NOT be added to REQUIRES here. - - This change will not affect most python builds. diff --git a/python/python3-build/python3-build.SlackBuild b/python/python3-build/python3-build.SlackBuild deleted file mode 100644 index 59cf3050ae..0000000000 --- a/python/python3-build/python3-build.SlackBuild +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-build - -# Copyright 2023-2025 fourtysixandtwo -# Copyright 2022 toolonely -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20230507 46and2: New maintainer, updated version and deps. -# -build process changed -# 20231212 46and2: Remove python-importlib_metadata as dep, see README. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-build -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.3.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m flit_core.wheel -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - PKG-INFO \ - README.md \ - LICENSE \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-build/python3-build.info b/python/python3-build/python3-build.info deleted file mode 100644 index bd75dedacb..0000000000 --- a/python/python3-build/python3-build.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-build" -VERSION="1.3.0" -HOMEPAGE="https://github.com/pypa/build" -DOWNLOAD="https://files.pythonhosted.org/packages/source/b/build/build-1.3.0.tar.gz" -MD5SUM="48f7fbc11051430eab3c1abe216bed7a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-pyproject-hooks" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-build/slack-desc b/python/python3-build/slack-desc deleted file mode 100644 index e81b98eb3b..0000000000 --- a/python/python3-build/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-build: python3-build (a simple, correct PEP517 package builder) -python3-build: -python3-build: Homepage: https://github.com/pypa/build -python3-build: -python3-build: -python3-build: -python3-build: -python3-build: -python3-build: -python3-build: -python3-build: diff --git a/python/python3-calver/README b/python/python3-calver/README deleted file mode 100644 index a7fb2114b2..0000000000 --- a/python/python3-calver/README +++ /dev/null @@ -1,4 +0,0 @@ -python3-calver (setuptools extension for CalVer package versions) - -The calver package is a setuptools extension for automatically -defining your Python package version as a calendar version. diff --git a/python/python3-calver/python3-calver.SlackBuild b/python/python3-calver/python3-calver.SlackBuild deleted file mode 100644 index 06d94de3bc..0000000000 --- a/python/python3-calver/python3-calver.SlackBuild +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-calver - -# Copyright 2023-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-calver -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-2025.4.17} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-calver/python3-calver.info b/python/python3-calver/python3-calver.info deleted file mode 100644 index b4b2b9578d..0000000000 --- a/python/python3-calver/python3-calver.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-calver" -VERSION="2025.4.17" -HOMEPAGE="https://github.com/di/calver" -DOWNLOAD="https://files.pythonhosted.org/packages/source/c/calver/calver-2025.4.17.tar.gz" -MD5SUM="b02f51c61083eb5bd1b84218ec2fffd3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-setuptools-opt" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-calver/slack-desc b/python/python3-calver/slack-desc deleted file mode 100644 index b07e78c4ab..0000000000 --- a/python/python3-calver/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-calver: python3-calver (setuptools extension for CalVer package versions) -python3-calver: -python3-calver: The calver package is a setuptools extension for automatically -python3-calver: defining your Python package version as a calendar version. -python3-calver: -python3-calver: Homepage: https://github.com/di/calver -python3-calver: -python3-calver: -python3-calver: -python3-calver: -python3-calver: diff --git a/python/python3-dnspython/README b/python/python3-dnspython/README deleted file mode 100644 index 983875ac1e..0000000000 --- a/python/python3-dnspython/README +++ /dev/null @@ -1,8 +0,0 @@ -dnspython is a DNS toolkit for Python. It supports almost all record -types. It can be used for queries, zone transfers, and dynamic updates. -It supports TSIG authenticated messages and EDNS0. - -dnspython provides both high and low level access to DNS. The high -level classes perform queries for data of a given name, type, and -class, and return an answer set. The low level classes allow direct -manipulation of DNS zones, messages, names, and records. diff --git a/python/python3-dnspython/python3-dnspython.SlackBuild b/python/python3-dnspython/python3-dnspython.SlackBuild deleted file mode 100644 index a6a8efbaac..0000000000 --- a/python/python3-dnspython/python3-dnspython.SlackBuild +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-dnspython - -# Copyright 2009-2019 Larry Hajali -# Copyright 2023 Yth | Pont-en-Royans, France | yth@ythogtha.org -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-dnspython -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-2.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \; - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-dnspython/python3-dnspython.info b/python/python3-dnspython/python3-dnspython.info deleted file mode 100644 index 66e72c839d..0000000000 --- a/python/python3-dnspython/python3-dnspython.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-dnspython" -VERSION="2.7.0" -HOMEPAGE="http://www.dnspython.org/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/d/dnspython/dnspython-2.7.0.tar.gz" -MD5SUM="7a8f6f15038a116598744517931420d0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-poetry-core python3-exceptiongroup python3-httpcore" -MAINTAINER="Yth - Arnaud" -EMAIL="yth@ythogtha.org" diff --git a/python/python3-dnspython/slack-desc b/python/python3-dnspython/slack-desc deleted file mode 100644 index 8cf90386c9..0000000000 --- a/python/python3-dnspython/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-dnspython: python3-dnspython (Python API for DNS) -python3-dnspython: -python3-dnspython: dnspython is a DNS toolkit for Python. It supports almost all record -python3-dnspython: types. It can be used for queries, zone transfers, and dynamic -python3-dnspython: updates. It supports TSIG authenticated messages and EDNS0. -python3-dnspython: -python3-dnspython: Homepage: http://www.dnspython.org/ -python3-dnspython: -python3-dnspython: -python3-dnspython: -python3-dnspython: diff --git a/python/python3-editables/README b/python/python3-editables/README deleted file mode 100644 index a3cd52fce8..0000000000 --- a/python/python3-editables/README +++ /dev/null @@ -1,6 +0,0 @@ -python3-editables (A Python library for creating editable wheels) - -This library supports the building of wheels which, when installed, -will expose packages in a local directory on sys.path in "editable -mode". In other words, changes to the package source will be reflected -in the package visible to Python, without needing a reinstall. diff --git a/python/python3-editables/python3-editables.SlackBuild b/python/python3-editables/python3-editables.SlackBuild deleted file mode 100644 index 2c8681fccb..0000000000 --- a/python/python3-editables/python3-editables.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-editables - -# Copyright 2022-23 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-editables -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-editables/python3-editables.info b/python/python3-editables/python3-editables.info deleted file mode 100644 index c954b6059a..0000000000 --- a/python/python3-editables/python3-editables.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-editables" -VERSION="0.5" -HOMEPAGE="https://github.com/pfmoore/editables" -DOWNLOAD="https://files.pythonhosted.org/packages/source/e/editables/editables-0.5.tar.gz" -MD5SUM="520de8c3a9dc5dfb2b365d104541c9de" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build python3-wheel" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-editables/slack-desc b/python/python3-editables/slack-desc deleted file mode 100644 index a0b5bf5903..0000000000 --- a/python/python3-editables/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-editables: python3-editables (A Python library for creating editable wheels) -python3-editables: -python3-editables: This library supports the building of wheels which, when installed, -python3-editables: will expose packages in a local directory on sys.path in "editable -python3-editables: mode". In other words, changes to the package source will be reflected -python3-editables: in the package visible to Python, without needing a reinstall. -python3-editables: -python3-editables: -python3-editables: Homepage: https://github.com/pfmoore/editables -python3-editables: -python3-editables: diff --git a/python/python3-exceptiongroup/README b/python/python3-exceptiongroup/README deleted file mode 100644 index 067316d0b2..0000000000 --- a/python/python3-exceptiongroup/README +++ /dev/null @@ -1,4 +0,0 @@ -python3-exceptiongroup (Backport of PEP 654 exception groups) - -This is a backport of the BaseExceptionGroup and ExceptionGroup -classes from Python 3.11. diff --git a/python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild b/python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild deleted file mode 100644 index ce7ccfe619..0000000000 --- a/python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-exceptiongroup - -# Copyright 2023-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-exceptiongroup -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.3.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-exceptiongroup/python3-exceptiongroup.info b/python/python3-exceptiongroup/python3-exceptiongroup.info deleted file mode 100644 index df682acfb0..0000000000 --- a/python/python3-exceptiongroup/python3-exceptiongroup.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-exceptiongroup" -VERSION="1.3.0" -HOMEPAGE="https://github.com/agronholm/exceptiongroup" -DOWNLOAD="https://files.pythonhosted.org/packages/source/e/exceptiongroup/exceptiongroup-1.3.0.tar.gz" -MD5SUM="85af34d4754844f5becff4fb0f9f87e2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-flit_scm python3-typing-extensions" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-exceptiongroup/slack-desc b/python/python3-exceptiongroup/slack-desc deleted file mode 100644 index edf3fce552..0000000000 --- a/python/python3-exceptiongroup/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-exceptiongroup: python3-exceptiongroup (Backport of PEP 654 exception groups) -python3-exceptiongroup: -python3-exceptiongroup: This is a backport of the BaseExceptionGroup and ExceptionGroup -python3-exceptiongroup: classes from Python 3.11. -python3-exceptiongroup: -python3-exceptiongroup: Homepage: https://github.com/agronholm/exceptiongroup -python3-exceptiongroup: -python3-exceptiongroup: -python3-exceptiongroup: -python3-exceptiongroup: -python3-exceptiongroup: diff --git a/python/python3-flit_core/README b/python/python3-flit_core/README deleted file mode 100644 index 67f3ec7efd..0000000000 --- a/python/python3-flit_core/README +++ /dev/null @@ -1,9 +0,0 @@ -python3-flit_core (Simplified pkging of Python modules, core backend) - -Flit is a simple way to put Python packages and modules on PyPI. It -tries to require less thought about packaging and help you avoid -common mistakes. - -This provides a PEP 517 build backend for packages using Flit. -The only public interface is the API specified by PEP 517, at -``flit_core.buildapi``. diff --git a/python/python3-flit_core/python3-flit_core.SlackBuild b/python/python3-flit_core/python3-flit_core.SlackBuild deleted file mode 100644 index 49df4b65b6..0000000000 --- a/python/python3-flit_core/python3-flit_core.SlackBuild +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-flit_core - -# Copyright 2022-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20230412 46and2: Remove DEPS, use bootstrap install. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-flit_core -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-3.12.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -python3 -m flit_core.wheel -python3 bootstrap_install.py --install-root "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-flit_core/python3-flit_core.info b/python/python3-flit_core/python3-flit_core.info deleted file mode 100644 index f23136f6f7..0000000000 --- a/python/python3-flit_core/python3-flit_core.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-flit_core" -VERSION="3.12.0" -HOMEPAGE="https://github.com/pypa/flit" -DOWNLOAD="https://files.pythonhosted.org/packages/source/f/flit_core/flit_core-3.12.0.tar.gz" -MD5SUM="c538415c1f27bd69cbbbf3cdd5135d39" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-flit_core/slack-desc b/python/python3-flit_core/slack-desc deleted file mode 100644 index 1ec6924944..0000000000 --- a/python/python3-flit_core/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-flit_core: python3-flit_core (Simplified pkging of Python modules, core backend) -python3-flit_core: -python3-flit_core: Flit is a simple way to put Python packages and modules on PyPI. It -python3-flit_core: tries to require less thought about packaging and help you avoid -python3-flit_core: common mistakes. -python3-flit_core: -python3-flit_core: -python3-flit_core: -python3-flit_core: Homepage: https://github.com/pypa/flit -python3-flit_core: -python3-flit_core: diff --git a/python/python3-glad/README b/python/python3-glad/README deleted file mode 100644 index 0dd3f36200..0000000000 --- a/python/python3-glad/README +++ /dev/null @@ -1,5 +0,0 @@ -python3-glad (Python binding for GLAD Loader-Generator) - -GLAD is a Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator -based on the official specifications for multiple languages. - diff --git a/python/python3-glad/python3-glad.SlackBuild b/python/python3-glad/python3-glad.SlackBuild deleted file mode 100644 index 396bd98656..0000000000 --- a/python/python3-glad/python3-glad.SlackBuild +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-glad - -# Copyright 2023,2024 Christoph Willing Sydney, Australia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-glad -SRCNAM=glad -VERSION=${VERSION:-2.0.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 xf $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 {} \; - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-glad/python3-glad.info b/python/python3-glad/python3-glad.info deleted file mode 100644 index 9dbcf95f93..0000000000 --- a/python/python3-glad/python3-glad.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-glad" -VERSION="2.0.8" -HOMEPAGE="https://github.com/Dav1dde/glad" -DOWNLOAD="https://github.com/Dav1dde/glad/archive/v2.0.8/glad-2.0.8.tar.gz" -MD5SUM="028c39d581e6b53e53871f1dc21cf442" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-setuptools-opt" -MAINTAINER="Christoph Willling" -EMAIL="chris.willing@linux.com" diff --git a/python/python3-glad/slack-desc b/python/python3-glad/slack-desc deleted file mode 100644 index 459c4a5157..0000000000 --- a/python/python3-glad/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-glad: python3-glad (Python binding for GLAD Loader-Generator) -python3-glad: -python3-glad: GLAD is a Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator -python3-glad: based on the official specifications for multiple languages. -python3-glad: -python3-glad: -python3-glad: -python3-glad: -python3-glad: -python3-glad: -python3-glad: diff --git a/python/python3-h5py/python3-h5py.SlackBuild b/python/python3-h5py/python3-h5py.SlackBuild index 459f64efa4..3cace35643 100644 --- a/python/python3-h5py/python3-h5py.SlackBuild +++ b/python/python3-h5py/python3-h5py.SlackBuild @@ -76,12 +76,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ -o -perm 400 \) -exec chmod 644 {} \; +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') + # Remove RPATH sed -i "s/settings\\['runtime_library_dirs'\\] = settings\\['library_dirs'\\]/pass/" setup_build.py -H5PY_SYSTEM_LZF=1 python3 setup.py build -python3 setup.py install --root=$PKG --skip-build -cp -a h5py/{_hl,tests,*.py} $PKG/usr/lib${LIBDIRSUFFIX}/python3.9/site-packages/h5py +H5PY_SYSTEM_LZF=1 python3 -m build --no-isolation +python3 -m installer -d "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/python3-hatch_vcs/README b/python/python3-hatch_vcs/README deleted file mode 100644 index 5352bdcb6d..0000000000 --- a/python/python3-hatch_vcs/README +++ /dev/null @@ -1,4 +0,0 @@ -python3-hatch_vcs (Hatch plugin for versioning with preferred VCS) - -This provides a plugin for Hatch that uses your preferred version -control system (like Git) to determine project versions. diff --git a/python/python3-hatch_vcs/python3-hatch_vcs.SlackBuild b/python/python3-hatch_vcs/python3-hatch_vcs.SlackBuild deleted file mode 100644 index 08471101bd..0000000000 --- a/python/python3-hatch_vcs/python3-hatch_vcs.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-hatch_vcs - -# Copyright 2022-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-hatch_vcs -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.5.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -#lower version requirement of setuptools-scm to get rid of warning -sed -i 's/6\.4\.0/6.3.2/' pyproject.toml - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-hatch_vcs/python3-hatch_vcs.info b/python/python3-hatch_vcs/python3-hatch_vcs.info deleted file mode 100644 index 147d3b041e..0000000000 --- a/python/python3-hatch_vcs/python3-hatch_vcs.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-hatch_vcs" -VERSION="0.5.0" -HOMEPAGE="https://github.com/ofek/hatch-vcs" -DOWNLOAD="https://files.pythonhosted.org/packages/source/h/hatch_vcs/hatch_vcs-0.5.0.tar.gz" -MD5SUM="9a22a9f7203783e526959d34510a9672" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-hatchling" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-hatch_vcs/slack-desc b/python/python3-hatch_vcs/slack-desc deleted file mode 100644 index 7fa4dcce7d..0000000000 --- a/python/python3-hatch_vcs/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-hatch_vcs: python3-hatch_vcs (Hatch plugin for versioning with preferred VCS) -python3-hatch_vcs: -python3-hatch_vcs: This provides a plugin for Hatch that uses your preferred version -python3-hatch_vcs: control system (like Git) to determine project versions. -python3-hatch_vcs: -python3-hatch_vcs: -python3-hatch_vcs: -python3-hatch_vcs: -python3-hatch_vcs: Homepage: https://github.com/ofek/hatch-vcs -python3-hatch_vcs: -python3-hatch_vcs: diff --git a/python/python3-hatchling/README b/python/python3-hatchling/README deleted file mode 100644 index 23639b967c..0000000000 --- a/python/python3-hatchling/README +++ /dev/null @@ -1,10 +0,0 @@ -python3-hatchling (Hatch build backend) - -This is the extensible, standards compliant build backend used by -Hatch. - -Add the following before the python3 build commands in your -Slackbuild as hatchling now requires python3-packaging-opt: - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages diff --git a/python/python3-hatchling/python3-hatchling.SlackBuild b/python/python3-hatchling/python3-hatchling.SlackBuild deleted file mode 100644 index 1341f4d561..0000000000 --- a/python/python3-hatchling/python3-hatchling.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-hatchling - -# Copyright 2022-2024 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240908 46and2: Updated version of packaging in /opt is now required. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-hatchling -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.27.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-hatchling/python3-hatchling.info b/python/python3-hatchling/python3-hatchling.info deleted file mode 100644 index 4652ebbd3e..0000000000 --- a/python/python3-hatchling/python3-hatchling.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-hatchling" -VERSION="1.27.0" -HOMEPAGE="https://github.com/pypa/hatch/tree/master/backend" -DOWNLOAD="https://files.pythonhosted.org/packages/source/h/hatchling/hatchling-1.27.0.tar.gz" -MD5SUM="6ffb3087c9b6a9ffbfc1bb394f7ed1a8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-editables python3-pathspec python3-pluggy python3-trove-classifiers python3-setuptools-opt" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-hatchling/slack-desc b/python/python3-hatchling/slack-desc deleted file mode 100644 index 269e1d0265..0000000000 --- a/python/python3-hatchling/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-hatchling: python3-hatchling (Hatch build backend) -python3-hatchling: -python3-hatchling: This is the extensible, standards compliant build backend used by -python3-hatchling: Hatch. -python3-hatchling: -python3-hatchling: -python3-hatchling: -python3-hatchling: -python3-hatchling: Homepage: https://github.com/pypa/hatch/tree/master/backend -python3-hatchling: -python3-hatchling: diff --git a/python/python3-installer/README b/python/python3-installer/README deleted file mode 100644 index 46ae1e6e70..0000000000 --- a/python/python3-installer/README +++ /dev/null @@ -1,3 +0,0 @@ -This is a low-level library for installing a Python package from a -wheel distribution. It provides basic functionality and abstractions -for handling wheels and installing packages from wheels. diff --git a/python/python3-installer/python3-installer.SlackBuild b/python/python3-installer/python3-installer.SlackBuild deleted file mode 100644 index 6d8c04f8ac..0000000000 --- a/python/python3-installer/python3-installer.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-installer - -# Copyright 2023 fourtysixandtwo -# Copyright 2022 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20230517 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-installer -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m flit_core.wheel -PYTHONPATH=src python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -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 CONTRIBUTING.md LICENSE PKG-INFO README.md 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 diff --git a/python/python3-installer/python3-installer.info b/python/python3-installer/python3-installer.info deleted file mode 100644 index 5969ab6d7e..0000000000 --- a/python/python3-installer/python3-installer.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-installer" -VERSION="0.7.0" -HOMEPAGE="https://github.com/pypa/installer" -DOWNLOAD="https://files.pythonhosted.org/packages/source/i/installer/installer-0.7.0.tar.gz" -MD5SUM="d961d1105c9270049528b1167ed021bc" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-flit_core" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-installer/slack-desc b/python/python3-installer/slack-desc deleted file mode 100644 index 23af788c6b..0000000000 --- a/python/python3-installer/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -python3-installer: python3-installer (Library for installing Python packages from wheels) -python3-installer: -python3-installer: This is a low-level library for installing a Python package from a -python3-installer: wheel distribution. It provides basic functionality and abstractions -python3-installer: for handling wheels and installing packages from wheels. -python3-installer: -python3-installer: Homepage: https://github.com/pypa/installer -python3-installer: -python3-installer: -python3-installer: -python3-installer: diff --git a/python/python3-lxml/README b/python/python3-lxml/README deleted file mode 100644 index 09ea99ca99..0000000000 --- a/python/python3-lxml/README +++ /dev/null @@ -1,5 +0,0 @@ -lxml is the most feature-rich and easy-to-use library for processing -XML and HTML in the Python language. It's also very fast and memory -friendly, just so you know. - -This can coexist with python2-lxml without issue. diff --git a/python/python3-lxml/python3-lxml.SlackBuild b/python/python3-lxml/python3-lxml.SlackBuild deleted file mode 100644 index 11b2be41cc..0000000000 --- a/python/python3-lxml/python3-lxml.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-lxml - -# Based on Slackware build script for lxml -# Copyright 2009-2019 Larry Hajali - -# Copyright 2024-2025 Jeremy Hansen -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-lxml -SRCNAM=lxml -VERSION=${VERSION:-6.0.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -else - SLKCFLAGS="-O2" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $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" \ -python3 setup.py install --with-unicode-strings --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES.txt CREDITS.txt LICENSE*.txt README.rst doc/FAQ.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 diff --git a/python/python3-lxml/python3-lxml.info b/python/python3-lxml/python3-lxml.info deleted file mode 100644 index fe27f91d9f..0000000000 --- a/python/python3-lxml/python3-lxml.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-lxml" -VERSION="6.0.2" -HOMEPAGE="https://lxml.de/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/l/lxml/lxml-6.0.2.tar.gz" -MD5SUM="ac9a945976227fd854d3e9e034e52ca1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="BeautifulSoup4 html5lib python3-cssselect" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/python/python3-lxml/slack-desc b/python/python3-lxml/slack-desc deleted file mode 100644 index 470095bb6a..0000000000 --- a/python/python3-lxml/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-lxml: python3-lxml (The lxml XML toolkit for Python) -python3-lxml: -python3-lxml: lxml is the most feature-rich and easy-to-use library for processing -python3-lxml: XML and HTML in the Python language. It's also very fast and memory -python3-lxml: friendly, just so you know. -python3-lxml: -python3-lxml: Homepage: https://lxml.de/ -python3-lxml: -python3-lxml: -python3-lxml: -python3-lxml: diff --git a/python/python3-meson-opt/README b/python/python3-meson-opt/README deleted file mode 100644 index e72ffb354b..0000000000 --- a/python/python3-meson-opt/README +++ /dev/null @@ -1,18 +0,0 @@ -python3-meson-opt (meson installed to /opt) - -Meson is a cross-platform build system designed to be both as fast and -as user friendly as possible. It supports many languages and -compilers, including GCC, Clang, PGI, Intel, and Visual Studio. Its -build definitions are written in a simple non-Turing complete DSL. - -NOTE: - Install bin and docs to /opt/meson - Installs module to /opt/python$PYVER/site-packages - -Add the following before the python3 build commands in your -Slackbuild to use this version over the stock one in 15.0. My testing -has shown the newer meson bin does not need to be added to PATH, but -YMMV: - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages diff --git a/python/python3-meson-opt/python3-meson-opt.SlackBuild b/python/python3-meson-opt/python3-meson-opt.SlackBuild deleted file mode 100644 index 1efa643b05..0000000000 --- a/python/python3-meson-opt/python3-meson-opt.SlackBuild +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-meson-opt - -# Copyright 2023-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-meson-opt -SRCNAM=meson -VERSION=${VERSION:-1.9.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -ARCH=noarch - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" -p "opt/meson" dist/*.whl - -if [ "$PKG/opt/" != "/opt/" ]; then - mkdir -p $PKG/opt - mv $PKG/opt/meson/lib*/python$PYVER $PKG/opt/ - rmdir $PKG/opt/meson/lib* -fi - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a contributing.md COPYING PKG-INFO README* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-meson-opt/python3-meson-opt.info b/python/python3-meson-opt/python3-meson-opt.info deleted file mode 100644 index 9ed8424098..0000000000 --- a/python/python3-meson-opt/python3-meson-opt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-meson-opt" -VERSION="1.9.1" -HOMEPAGE="https://github.com/mesonbuild/meson" -DOWNLOAD="https://github.com/mesonbuild/meson/releases/download/1.9.1/meson-1.9.1.tar.gz" -MD5SUM="19e0a1091cec23d369dd77d852844195" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build python3-wheel" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-meson-opt/slack-desc b/python/python3-meson-opt/slack-desc deleted file mode 100644 index 3654d33869..0000000000 --- a/python/python3-meson-opt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-meson-opt: python3-meson-opt (meson installed to /opt) -python3-meson-opt: -python3-meson-opt: Meson is a cross-platform build system designed to be both as fast and -python3-meson-opt: as user friendly as possible. It supports many languages and -python3-meson-opt: compilers, including GCC, Clang, PGI, Intel, and Visual Studio. Its -python3-meson-opt: build definitions are written in a simple non-Turing complete DSL. -python3-meson-opt: -python3-meson-opt: Installs to /opt/python$PYVER/site-packages -python3-meson-opt: -python3-meson-opt: Project URL: https://github.com/mesonbuild/meson -python3-meson-opt: diff --git a/python/python3-mesonpy/README b/python/python3-mesonpy/README deleted file mode 100644 index 7704a38f0b..0000000000 --- a/python/python3-mesonpy/README +++ /dev/null @@ -1,12 +0,0 @@ -python3-mesonpy (Meson Python build backend, PEP517) - -meson-python is a Python build backend built on top of the Meson build -system. It enables to use Meson for the configuration and build steps -of Python packages. - -NOTE: Does not work with the stock 15.0 meson. - -PYTHONPATH needs to be set to use python3-meson-opt. - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages diff --git a/python/python3-mesonpy/python3-mesonpy.SlackBuild b/python/python3-mesonpy/python3-mesonpy.SlackBuild deleted file mode 100644 index ce3066f85f..0000000000 --- a/python/python3-mesonpy/python3-mesonpy.SlackBuild +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-mesonpy - -# Copyright 2023-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-mesonpy -SRCNAM=meson_python -VERSION=${VERSION:-0.18.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -# to use updated meson and packaging -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -# cannot be built from sdist so just build the wheel -python3 -m build --wheel --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGELOG.rst LICENSE README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-mesonpy/python3-mesonpy.info b/python/python3-mesonpy/python3-mesonpy.info deleted file mode 100644 index a387800aae..0000000000 --- a/python/python3-mesonpy/python3-mesonpy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-mesonpy" -VERSION="0.18.0" -HOMEPAGE="https://github.com/mesonbuild/meson-python" -DOWNLOAD="https://files.pythonhosted.org/packages/source/m/meson-python/meson_python-0.18.0.tar.gz" -MD5SUM="b4d7f9ef6f09deb8dc8a7e5cbf16778e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-pyproject-metadata python3-meson-opt python3-packaging-opt" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-mesonpy/slack-desc b/python/python3-mesonpy/slack-desc deleted file mode 100644 index 91022c4ae6..0000000000 --- a/python/python3-mesonpy/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-mesonpy: python3-mesonpy (Meson Python build backend, PEP517) -python3-mesonpy: -python3-mesonpy: meson-python is a Python build backend built on top of the Meson build -python3-mesonpy: system. It enables to use Meson for the configuration and build steps -python3-mesonpy: of Python packages. -python3-mesonpy: -python3-mesonpy: Homepage: https://github.com/mesonbuild/meson-python -python3-mesonpy: -python3-mesonpy: -python3-mesonpy: -python3-mesonpy: diff --git a/python/python3-numba/python3-numba.SlackBuild b/python/python3-numba/python3-numba.SlackBuild index bf173160d8..c4788245a3 100644 --- a/python/python3-numba/python3-numba.SlackBuild +++ b/python/python3-numba/python3-numba.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-numba -VERSION=${VERSION:-0.59.1} +VERSION=${VERSION:-0.61.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-numba/python3-numba.info b/python/python3-numba/python3-numba.info index 8214a61097..315adaf2ee 100644 --- a/python/python3-numba/python3-numba.info +++ b/python/python3-numba/python3-numba.info @@ -1,8 +1,8 @@ PRGNAM="python3-numba" -VERSION="0.59.1" +VERSION="0.61.2" HOMEPAGE="https://numba.readthedocs.io/en/stable" -DOWNLOAD="https://files.pythonhosted.org/packages/bb/84/468592513867604800592b58d106f5e7e6ef61de226b59c1e9313917fbbb/numba-0.59.1.tar.gz" -MD5SUM="e3b956b6129aa5f6d448119c18006e58" +DOWNLOAD="https://files.pythonhosted.org/packages/source/n/numba/numba-0.61.2.tar.gz" +MD5SUM="a3bfbab805ad29c05144321d1a8e31af" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-numpy" diff --git a/python/python3-opencv/no-ADE-download-4.10.0.84.diff b/python/python3-opencv/no-ADE-download-4.10.0.84.diff new file mode 100644 index 0000000000..06c7d1eb36 --- /dev/null +++ b/python/python3-opencv/no-ADE-download-4.10.0.84.diff @@ -0,0 +1,37 @@ +--- opencv/modules/gapi/cmake/DownloadADE.cmake.orig 2024-06-18 03:55:33.000000000 +1000 ++++ opencv/modules/gapi/cmake/DownloadADE.cmake 2024-08-20 18:52:27.309000000 +1000 +@@ -2,20 +2,20 @@ + set(ade_filename "v0.1.2d.zip") + set(ade_subdir "ade-0.1.2d") + set(ade_md5 "dbb095a8bf3008e91edbbf45d8d34885") +-ocv_download(FILENAME ${ade_filename} +- HASH ${ade_md5} +- URL +- "${OPENCV_ADE_URL}" +- "$ENV{OPENCV_ADE_URL}" +- "https://github.com/opencv/ade/archive/" +- DESTINATION_DIR ${ade_src_dir} +- ID ADE +- STATUS res +- UNPACK RELATIVE_URL) +- +-if (NOT res) +- return() +-endif() ++#ocv_download(FILENAME ${ade_filename} ++# HASH ${ade_md5} ++# URL ++# "${OPENCV_ADE_URL}" ++# "$ENV{OPENCV_ADE_URL}" ++# "https://github.com/opencv/ade/archive/" ++# DESTINATION_DIR ${ade_src_dir} ++# ID ADE ++# STATUS res ++# UNPACK RELATIVE_URL) ++# ++#if (NOT res) ++# return() ++#endif() + + set(ADE_root "${ade_src_dir}/${ade_subdir}/sources/ade") + file(GLOB_RECURSE ADE_sources "${ADE_root}/source/*.cpp") diff --git a/python/python3-opencv/no-ADE-download.diff b/python/python3-opencv/no-ADE-download.diff deleted file mode 100644 index 8c72d9660f..0000000000 --- a/python/python3-opencv/no-ADE-download.diff +++ /dev/null @@ -1,37 +0,0 @@ ---- opencv/modules/gapi/cmake/DownloadADE.cmake.orig 2022-03-04 16:48:17.000000000 +1000 -+++ opencv/modules/gapi/cmake/DownloadADE.cmake 2024-08-19 23:51:02.079316762 +1000 -@@ -2,20 +2,20 @@ - set(ade_filename "v0.1.1f.zip") - set(ade_subdir "ade-0.1.1f") - set(ade_md5 "b624b995ec9c439cbc2e9e6ee940d3a2") --ocv_download(FILENAME ${ade_filename} -- HASH ${ade_md5} -- URL -- "${OPENCV_ADE_URL}" -- "$ENV{OPENCV_ADE_URL}" -- "https://github.com/opencv/ade/archive/" -- DESTINATION_DIR ${ade_src_dir} -- ID ADE -- STATUS res -- UNPACK RELATIVE_URL) -- --if (NOT res) -- return() --endif() -+#ocv_download(FILENAME ${ade_filename} -+# HASH ${ade_md5} -+# URL -+# "${OPENCV_ADE_URL}" -+# "$ENV{OPENCV_ADE_URL}" -+# "https://github.com/opencv/ade/archive/" -+# DESTINATION_DIR ${ade_src_dir} -+# ID ADE -+# STATUS res -+# UNPACK RELATIVE_URL) -+# -+#if (NOT res) -+# return() -+#endif() - - set(ADE_root "${ade_src_dir}/${ade_subdir}/sources/ade") - file(GLOB_RECURSE ADE_sources "${ADE_root}/source/*.cpp") diff --git a/python/python3-opencv/python3-opencv.SlackBuild b/python/python3-opencv/python3-opencv.SlackBuild index 54099b6e72..a3d1bf35c7 100644 --- a/python/python3-opencv/python3-opencv.SlackBuild +++ b/python/python3-opencv/python3-opencv.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-opencv -VERSION=${VERSION:-4.5.5.64} -ADEVERSION=${ADEVERSION:-0.1.1f} +VERSION=${VERSION:-4.10.0.84} +ADEVERSION=${ADEVERSION:-0.1.2d} SRCNAM=opencv-python BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -63,7 +63,7 @@ cd $SRCNAM-$VERSION patch -p0 < $CWD/sync_with_sci-build-$VERSION.diff # Provide local ADE rather than download during build -patch -p0 < $CWD/no-ADE-download.diff +patch -p0 < $CWD/no-ADE-download-$VERSION.diff ADE_DIR=_skbuild/linux-${ARCH/i586/i686}-$PYVER/cmake-build/3rdparty/ade mkdir -p $ADE_DIR cd $ADE_DIR @@ -77,6 +77,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 {} \; +export CMAKE_POLICY_VERSION_MINIMUM=3.5 [ "${CONTRIB:-1}" = "1" ] && export ENABLE_CONTRIB=1 export CMAKE_ARGS="-DWITH_IPP=OFF -DOPENCV_ENABLE_NONFREE=ON" @@ -85,6 +86,9 @@ pip3 wheel . --no-build-isolation --verbose pip3 install opencv_python-${VERSION}-*.whl --root $PKG unset ENABLE_CONTRIB +# pycache files have /tmp/SBo hardcoded, remove it and let it regenerate +find $PKG/usr/lib*/python*/site-packages/cv2/ -iname "*.pyc" -delete + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/python3-opencv/python3-opencv.info b/python/python3-opencv/python3-opencv.info index 2aba4680b2..f9324f48a2 100644 --- a/python/python3-opencv/python3-opencv.info +++ b/python/python3-opencv/python3-opencv.info @@ -1,10 +1,10 @@ PRGNAM="python3-opencv" -VERSION="4.5.5.64" +VERSION="4.10.0.84" HOMEPAGE="https://pypi.org/project/opencv-python" -DOWNLOAD="https://files.pythonhosted.org/packages/3c/61/ee4496192ed27f657532fdf0d814b05b9787e7fc5122ed3ca57282bae69c/opencv-python-4.5.5.64.tar.gz \ - https://github.com/opencv/ade/archive/refs/tags/v0.1.1f/ade-0.1.1f.zip" -MD5SUM="428bc4ea8ef33cb88b9b7c721fa92bb4 \ - b624b995ec9c439cbc2e9e6ee940d3a2" +DOWNLOAD="https://files.pythonhosted.org/packages/4a/e7/b70a2d9ab205110d715906fc8ec83fbb00404aeb3a37a0654fdb68eb0c8c/opencv-python-4.10.0.84.tar.gz \ + https://github.com/opencv/ade/archive/refs/tags/v0.1.2d/ade-0.1.2d.zip" +MD5SUM="8b65f9d0d3f5a056a4461f6b38d00be4 \ + dbb095a8bf3008e91edbbf45d8d34885" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-numpy scikit-build" diff --git a/python/python3-opencv/sync_with_sci-build-4.5.5.64.diff b/python/python3-opencv/sync_with_sci-build-4.5.5.64.diff deleted file mode 100644 index 5c9788aee5..0000000000 --- a/python/python3-opencv/sync_with_sci-build-4.5.5.64.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- setup.py.orig 2022-03-04 16:47:38.000000000 +1000 -+++ setup.py 2024-08-16 19:58:40.508399337 +1000 -@@ -23,13 +23,6 @@ - build_java = "ON" if get_build_env_var_by_name("java") else "OFF" - - install_requires = [ -- 'numpy>=1.13.3; python_version<"3.7"', -- 'numpy>=1.14.5; python_version>="3.7"', -- 'numpy>=1.17.3; python_version>="3.8"', -- 'numpy>=1.19.3; python_version>="3.9"', -- 'numpy>=1.21.2; python_version>="3.10"', -- 'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"', -- 'numpy>=1.21.2; python_version>="3.6" and platform_system=="Darwin" and platform_machine=="arm64"', - ] - - python_version = cmaker.CMaker.get_python_version() -@@ -451,7 +444,7 @@ - data_files, - # To get around a check that prepends source dir to paths and breaks package detection code. - cmake_source_dir="", -- cmake_install_dir=cmake_install_reldir, -+ _cmake_install_dir=cmake_install_reldir, - ) - - diff --git a/python/python3-packaging-opt/README b/python/python3-packaging-opt/README deleted file mode 100644 index b82522f8e1..0000000000 --- a/python/python3-packaging-opt/README +++ /dev/null @@ -1,6 +0,0 @@ -python3-packaging-opt (Install packaging in /opt) - -Reusable core utilities for various Python Packaging interoperability -specifications - -Installs to /opt/python$PYVER/site-packages diff --git a/python/python3-packaging-opt/python3-packaging-opt.SlackBuild b/python/python3-packaging-opt/python3-packaging-opt.SlackBuild deleted file mode 100644 index a44e7e108f..0000000000 --- a/python/python3-packaging-opt/python3-packaging-opt.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-packaging-opt - -# Copyright 2024-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-packaging-opt -SRCNAM=packaging -VERSION=${VERSION:-25.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -# installing into /opt, set to noarch -ARCH=noarch - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') - -python3 -m flit_core.wheel -python3 -m installer -d "$PKG" dist/*.whl - -if [ "$PKG/usr/" != "/usr/" ]; then - mkdir -p $PKG/opt - mv $PKG/usr/lib*/python$PYVER $PKG/opt/ - rmdir $PKG/usr/lib* -else - echo "ERROR: \$PKG is not set! We don't want to move the real /usr/lib*/python$PYVER" - exit 1 -fi - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE* PKG-INFO README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# If there's a CHANGELOG.rst, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r CHANGELOG.rst ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PRGNAM}-$VERSION) - cat CHANGELOG.rst | head -n 1000 > $DOCSDIR/CHANGELOG.rst - touch -r CHANGELOG.rst $DOCSDIR/CHANGELOG.rst -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-packaging-opt/python3-packaging-opt.info b/python/python3-packaging-opt/python3-packaging-opt.info deleted file mode 100644 index 68e46686df..0000000000 --- a/python/python3-packaging-opt/python3-packaging-opt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-packaging-opt" -VERSION="25.0" -HOMEPAGE="https://pypi.org/project/packaging/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/packaging/packaging-25.0.tar.gz" -MD5SUM="ab0ef21ddebe09d1803575120d3f99f8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-packaging-opt/slack-desc b/python/python3-packaging-opt/slack-desc deleted file mode 100644 index c3cb71ec8c..0000000000 --- a/python/python3-packaging-opt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-packaging-opt: python3-packaging-opt (Install packaging in /opt) -python3-packaging-opt: -python3-packaging-opt: Reusable core utilities for various Python Packaging interoperability -python3-packaging-opt: specifications -python3-packaging-opt: -python3-packaging-opt: Installs to /opt/python$PYVER/site-packages -python3-packaging-opt: -python3-packaging-opt: -python3-packaging-opt: Project URL: https://pypi.org/project/packaging/ -python3-packaging-opt: -python3-packaging-opt: diff --git a/python/python3-pandas/python3-pandas.SlackBuild b/python/python3-pandas/python3-pandas.SlackBuild index 22f2209c19..5bf4ef9671 100644 --- a/python/python3-pandas/python3-pandas.SlackBuild +++ b/python/python3-pandas/python3-pandas.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pandas SRCNAM=pandas -VERSION=${VERSION:-2.1.4} +VERSION=${VERSION:-2.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -65,17 +65,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 {} \; -# remove requirement -sed -i '/oldest-supported-numpy/d' pyproject.toml - -# convert to minimum req'd instead of pinned -sed -i 's/meson-python==/meson-python>=/' pyproject.toml -sed -i 's/meson==/meson>=/' pyproject.toml - -# needs newer meson -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages/ - # cannot build sdist, specify just wheel python3 -m build --wheel --no-isolation python3 -m installer -d "$PKG" dist/*.whl diff --git a/python/python3-pandas/python3-pandas.info b/python/python3-pandas/python3-pandas.info index 45852698ca..1bedf1dbb6 100644 --- a/python/python3-pandas/python3-pandas.info +++ b/python/python3-pandas/python3-pandas.info @@ -1,8 +1,8 @@ PRGNAM="python3-pandas" -VERSION="2.1.4" +VERSION="2.3.0" HOMEPAGE="https://pandas.pydata.org" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pandas/pandas-2.1.4.tar.gz" -MD5SUM="e4b598d1e0aac2a3407ed32added3f62" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pandas/pandas-2.3.0.tar.gz" +MD5SUM="b843cb1350a567ccae9896b7209f3942" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-numpy python3-dateutil python3-pytz tzdata python3-versioneer" diff --git a/python/python3-pathspec/README b/python/python3-pathspec/README deleted file mode 100644 index 9d82dd1624..0000000000 --- a/python/python3-pathspec/README +++ /dev/null @@ -1,6 +0,0 @@ -python3-pathspec (Library for gitignore style matching of file paths) - -pathspec is a utility library for pattern matching of file paths. So -far this only includes Git's wildmatch pattern matching which itself -is derived from Rsync's wildmatch. Git uses wildmatch for its -gitignore files. diff --git a/python/python3-pathspec/python3-pathspec.SlackBuild b/python/python3-pathspec/python3-pathspec.SlackBuild deleted file mode 100644 index 33d07db20e..0000000000 --- a/python/python3-pathspec/python3-pathspec.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-pathspec - -# Copyright 2022-23 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-pathspec -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.12.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-pathspec/python3-pathspec.info b/python/python3-pathspec/python3-pathspec.info deleted file mode 100644 index 91716e25c4..0000000000 --- a/python/python3-pathspec/python3-pathspec.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-pathspec" -VERSION="0.12.1" -HOMEPAGE="https://github.com/cpburnz/python-pathspec" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-0.12.1.tar.gz" -MD5SUM="2b26ad1981bfa23748e115f00085624c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-pathspec/slack-desc b/python/python3-pathspec/slack-desc deleted file mode 100644 index e0349b555b..0000000000 --- a/python/python3-pathspec/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-pathspec: python3-pathspec (Library for gitignore style matching of file paths) -python3-pathspec: -python3-pathspec: pathspec is a utility library for pattern matching of file paths. So -python3-pathspec: far this only includes Git's wildmatch pattern matching which itself -python3-pathspec: is derived from Rsync's wildmatch. Git uses wildmatch for its -python3-pathspec: gitignore files. -python3-pathspec: -python3-pathspec: -python3-pathspec: Homepage: https://github.com/cpburnz/python-pathspec -python3-pathspec: -python3-pathspec: diff --git a/python/python3-pluggy/README b/python/python3-pluggy/README deleted file mode 100644 index e446501433..0000000000 --- a/python/python3-pluggy/README +++ /dev/null @@ -1,6 +0,0 @@ -pluggy (mechanisms for python) - -This is the plugin manager as used by pytest but stripped of pytest -specific details. - -This is the Python 3 build of pluggy. diff --git a/python/python3-pluggy/python3-pluggy.SlackBuild b/python/python3-pluggy/python3-pluggy.SlackBuild deleted file mode 100644 index cf52ec8229..0000000000 --- a/python/python3-pluggy/python3-pluggy.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-pluggy - -# Copyright 2022 Isaac Yu -# Copyright 2023-2025 Jeremy Hansen -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-pluggy -SRCNAM=pluggy -VERSION=${VERSION:-1.6.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \; - -# Use newer, non-stock setuptools due to package requirements -# Requres python/python3-setuptools-opt build-time dependency -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -python3 -m build --wheel --no-isolation -python3 -m installer --destdir "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-pluggy/python3-pluggy.info b/python/python3-pluggy/python3-pluggy.info deleted file mode 100644 index e4bfbf54ff..0000000000 --- a/python/python3-pluggy/python3-pluggy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-pluggy" -VERSION="1.6.0" -HOMEPAGE="https://github.com/pytest-dev/pluggy" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pluggy/pluggy-1.6.0.tar.gz" -MD5SUM="54391218af778acb006c2d915085d469" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-setuptools-scm-opt" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/python/python3-pluggy/slack-desc b/python/python3-pluggy/slack-desc deleted file mode 100644 index 3b042787dc..0000000000 --- a/python/python3-pluggy/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-pluggy: python3-pluggy (mechanisms for python) -python3-pluggy: -python3-pluggy: This is the plugin manager as used by pytest but stripped of pytest -python3-pluggy: specific details. -python3-pluggy: -python3-pluggy: Homepage: https://github.com/pytest-dev/pluggy -python3-pluggy: -python3-pluggy: -python3-pluggy: -python3-pluggy: -python3-pluggy: diff --git a/python/python3-psutil/README b/python/python3-psutil/README deleted file mode 100644 index 8bc631773b..0000000000 --- a/python/python3-psutil/README +++ /dev/null @@ -1,6 +0,0 @@ -python3-psutil is a module providing an interface for retrieving -information on all running processes and system utilization (CPU, -memory, disks, network, users) in a portable way by using Python, -implementing many functionalities offered by command line tools such -as: ps, top, df, kill, free, lsof, netstat, ifconfig, nice, ionice, -iostat, iotop, uptime, pidof, tty, who, taskset, and pmap. diff --git a/python/python3-psutil/python3-psutil.SlackBuild b/python/python3-psutil/python3-psutil.SlackBuild deleted file mode 100644 index 33bca11d27..0000000000 --- a/python/python3-psutil/python3-psutil.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-psutil - -# Copyright 2022-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-psutil -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-7.1.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -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 CREDITS LICENSE {HISTORY,README}.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-psutil/python3-psutil.info b/python/python3-psutil/python3-psutil.info deleted file mode 100644 index 5755cd787b..0000000000 --- a/python/python3-psutil/python3-psutil.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-psutil" -VERSION="7.1.0" -HOMEPAGE="https://github.com/giampaolo/psutil" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/psutil/psutil-7.1.0.tar.gz" -MD5SUM="26dc8499f435198ab3f907edf9e7d7b4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build python3-wheel" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-psutil/slack-desc b/python/python3-psutil/slack-desc deleted file mode 100644 index c1cdca097f..0000000000 --- a/python/python3-psutil/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-psutil: python3-psutil (python interface for process and system info) -python3-psutil: -python3-psutil: psutil is a module providing an interface for retrieving information -python3-psutil: on all running processes and system utilization (CPU, memory, disks, -python3-psutil: network, users) in a portable way by using Python, implementing many -python3-psutil: functionalities offered by command line tools such as: ps, top, df, -python3-psutil: kill, free, lsof, netstat, ifconfig, nice, ionice, iostat, iotop, -python3-psutil: uptime, pidof, tty, who, taskset, and pmap -python3-psutil: -python3-psutil: Homepage: https://github.com/giampaolo/psutil -python3-psutil: diff --git a/python/python3-pygame/python3-pygame.SlackBuild b/python/python3-pygame/python3-pygame.SlackBuild index abb8afb33c..807753ef52 100644 --- a/python/python3-pygame/python3-pygame.SlackBuild +++ b/python/python3-pygame/python3-pygame.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pygame SRCNAM=pygame -VERSION=${VERSION:-2.5.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.6.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -74,8 +74,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix distro name for Slackware -patch -p1 < $CWD/setup.patch +# fix spawn error https://github.com/pygame/pygame/issues/4469 +sed -i "s/distutils.ccompiler.spawn/distutils.spawn.spawn/" setup.py # Since portmidi 2.0.2, libporttime is included in libportmidi. # Therfore use config-settings like for Fedora. diff --git a/python/python3-pygame/python3-pygame.info b/python/python3-pygame/python3-pygame.info index 48f2eae098..474dacdaca 100644 --- a/python/python3-pygame/python3-pygame.info +++ b/python/python3-pygame/python3-pygame.info @@ -1,8 +1,8 @@ PRGNAM="python3-pygame" -VERSION="2.5.2" +VERSION="2.6.1" HOMEPAGE="http://www.pygame.org/" -DOWNLOAD="https://files.pythonhosted.org/packages/c6/aa/2c0c867d6cff00966cfc2152b25f61599f87e88b239e4dcb8ad5357f0f69/pygame-2.5.2.tar.gz" -MD5SUM="bf45bc5288fa244a0dde60095bf4afb8" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pygame/pygame-2.6.1.tar.gz" +MD5SUM="cb6bf42a449b0bb1f53c534bcbcc220c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="portmidi" diff --git a/python/python3-pyicu/python3-pyicu.SlackBuild b/python/python3-pyicu/python3-pyicu.SlackBuild index cac46b19fb..e67480c0e4 100644 --- a/python/python3-pyicu/python3-pyicu.SlackBuild +++ b/python/python3-pyicu/python3-pyicu.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pyicu -VERSION=${VERSION:-2.8} +VERSION=${VERSION:-2.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -57,9 +57,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION +rm -rf ${SRCNAM,,}-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION +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/python/python3-pyicu/python3-pyicu.info b/python/python3-pyicu/python3-pyicu.info index ba6bd64d5d..b3da2bf895 100644 --- a/python/python3-pyicu/python3-pyicu.info +++ b/python/python3-pyicu/python3-pyicu.info @@ -1,8 +1,8 @@ PRGNAM="python3-pyicu" -VERSION="2.8" +VERSION="2.14" HOMEPAGE="https://github.com/ovalhub/pyicu" -DOWNLOAD="https://files.pythonhosted.org/packages/1a/b6/ede5f19d79655898162afa778d2f38cbde04b0cccb8737c649cd5d3d38e0/PyICU-2.8.tar.gz" -MD5SUM="307fe365cf75fec1d1f744c387ac67d8" +DOWNLOAD="https://files.pythonhosted.org/packages/52/21/4e9b0a3ace3027fc63107fa2b5d6e66e321e104da071d787856962fbad52/PyICU-2.14.tar.gz" +MD5SUM="7ec5ad0d62a2a27f919ca8a775352a71" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-pyproject-hooks/README b/python/python3-pyproject-hooks/README deleted file mode 100644 index dfa06b5179..0000000000 --- a/python/python3-pyproject-hooks/README +++ /dev/null @@ -1,9 +0,0 @@ -python3-pyproject-hooks (Wrappers to call PEP 517 build backend hooks) - -This is a low-level library for calling build-backends in -pyproject.toml-based project. It provides the basic functionality to -help write tooling that generates distribution files from -Python projects. - -The pep517 project has been replaced by this project (low level) and -the build project (high level). diff --git a/python/python3-pyproject-hooks/python3-pyproject-hooks.SlackBuild b/python/python3-pyproject-hooks/python3-pyproject-hooks.SlackBuild deleted file mode 100644 index 342c1ed675..0000000000 --- a/python/python3-pyproject-hooks/python3-pyproject-hooks.SlackBuild +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-pyproject-hooks - -# Copyright 2023-2024 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-pyproject-hooks -SRCNAM=pyproject_hooks -VERSION=${VERSION:-1.2.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m flit_core.wheel -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - PKG-INFO \ - README.rst \ - LICENSE \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-pyproject-hooks/python3-pyproject-hooks.info b/python/python3-pyproject-hooks/python3-pyproject-hooks.info deleted file mode 100644 index 91bbe9f069..0000000000 --- a/python/python3-pyproject-hooks/python3-pyproject-hooks.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-pyproject-hooks" -VERSION="1.2.0" -HOMEPAGE="https://github.com/pypa/pyproject-hooks" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pyproject_hooks/pyproject_hooks-1.2.0.tar.gz" -MD5SUM="ed3dd1b984339e83e35f676d7169c192" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-installer" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-pyproject-hooks/slack-desc b/python/python3-pyproject-hooks/slack-desc deleted file mode 100644 index 57fe2f9534..0000000000 --- a/python/python3-pyproject-hooks/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-pyproject-hooks: python3-pyproject-hooks (Wrappers to call PEP 517 build backend hooks) -python3-pyproject-hooks: -python3-pyproject-hooks: This is a low-level library for calling build-backends in -python3-pyproject-hooks: pyproject.toml-based project. It provides the basic functionality to -python3-pyproject-hooks: help write tooling that generates distribution files from -python3-pyproject-hooks: Python projects. -python3-pyproject-hooks: -python3-pyproject-hooks: The pep517 project has been replaced by this project (low level) and -python3-pyproject-hooks: the build project (high level). -python3-pyproject-hooks: -python3-pyproject-hooks: Homepage: https://github.com/pypa/pyproject-hooks diff --git a/python/python3-pyproject-metadata/README b/python/python3-pyproject-metadata/README deleted file mode 100644 index 0b5df1ddbb..0000000000 --- a/python/python3-pyproject-metadata/README +++ /dev/null @@ -1,8 +0,0 @@ -python3-pyproject-metadata (PEP 621 metadata parsing) - -This project does not implement the parsing of pyproject.toml -containing PEP 621 metadata. - -Instead, given a Python data structure representing PEP 621 metadata -(already parsed), it will validate this input and generate a PEP -643-compliant metadata file (e.g. PKG-INFO). diff --git a/python/python3-pyproject-metadata/python3-pyproject-metadata.SlackBuild b/python/python3-pyproject-metadata/python3-pyproject-metadata.SlackBuild deleted file mode 100644 index 5e2b206db7..0000000000 --- a/python/python3-pyproject-metadata/python3-pyproject-metadata.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-pyproject-metadata - -# Copyright 2023-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20250625 46and2: 0.9.1 requires newer packaging to build, -# https://github.com/pypa/pyproject-metadata/pull/239 - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-pyproject-metadata -SRCNAM=pyproject_metadata -VERSION=${VERSION:-0.9.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - LICENSE PKG-INFO README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-pyproject-metadata/python3-pyproject-metadata.info b/python/python3-pyproject-metadata/python3-pyproject-metadata.info deleted file mode 100644 index 8ac4333dba..0000000000 --- a/python/python3-pyproject-metadata/python3-pyproject-metadata.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-pyproject-metadata" -VERSION="0.9.1" -HOMEPAGE="https://github.com/FFY00/python-pyproject-metadata" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pyproject_metadata/pyproject_metadata-0.9.1.tar.gz" -MD5SUM="d897e16dca18204e421f912487730668" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-setuptools-opt" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-pyproject-metadata/slack-desc b/python/python3-pyproject-metadata/slack-desc deleted file mode 100644 index 5d966defd7..0000000000 --- a/python/python3-pyproject-metadata/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-pyproject-metadata: python3-pyproject-metadata (PEP 621 metadata parsing) -python3-pyproject-metadata: -python3-pyproject-metadata: This project does not implement the parsing of pyproject.toml -python3-pyproject-metadata: containing PEP 621 metadata. -python3-pyproject-metadata: -python3-pyproject-metadata: Instead, given a Python data structure representing PEP 621 metadata -python3-pyproject-metadata: (already parsed), it will validate this input and generate a PEP -python3-pyproject-metadata: 643-compliant metadata file (e.g. PKG-INFO). -python3-pyproject-metadata: -python3-pyproject-metadata: Homepage: https://github.com/FFY00/python-pyproject-metadata -python3-pyproject-metadata: diff --git a/python/python3-setuptools-opt/README b/python/python3-setuptools-opt/README deleted file mode 100644 index 5b65d6ba0b..0000000000 --- a/python/python3-setuptools-opt/README +++ /dev/null @@ -1,12 +0,0 @@ -python3-setuptools-opt (Install newer setuptools in /opt) - -Setuptools is a fully-featured, actively-maintained, and stable -library designed to facilitate packaging Python projects. - -Installs to /opt/python$PYVER/site-packages. - -Add the following before the python3 build commands in your -Slackbuild to use this version over the stock one in 15.0: - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages diff --git a/python/python3-setuptools-opt/python3-setuptools-opt.SlackBuild b/python/python3-setuptools-opt/python3-setuptools-opt.SlackBuild deleted file mode 100644 index a592d926fc..0000000000 --- a/python/python3-setuptools-opt/python3-setuptools-opt.SlackBuild +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-setuptools-opt - -# Copyright 2023-2025 fourtysixandtwo -# Copyright 2013-2014 Audrius Kažukauskas -# Copyright 2014, 2017, 2018, 2022 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-setuptools-opt -SRCNAM=setuptools -VERSION=${VERSION:-80.9.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - 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 {} \+ - -rm -f setuptools/*.exe - -# Recent Python versions support both a libdir (for pure Python modules) and a -# platlib (for $ARCH specific modules). We've always patched Python to use -# the platform directory (such as /usr/lib64/python$PYVER/site-packages on x86_64) -# for all modules. Perhaps we will rethink this, but since an installed -# setuptools now takes priority for reporting the libdir (and this no longer -# matches the platlib on architectures such as x86_64), let's patch setuptools -# to agree with Python: -if [ "$LIBDIRSUFFIX" = "64" ]; then - zcat $CWD/setuptools.x86_64.diff.gz | patch -p1 --verbose || exit 1 -fi - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -if [ "$PKG/usr/" != "/usr/" ]; then - mkdir -p $PKG/opt - mv $PKG/usr/lib*/python$PYVER $PKG/opt/ - rmdir $PKG/usr/lib* -else - echo "ERROR: \$PKG is not set! We don't want to move the real /usr/lib*/python$PYVER" - exit 1 -fi - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a NEWS.rst PKG-INFO README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# If there's a docs/history.rst, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r docs/history.rst ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PRGNAM}-$VERSION) - cat docs/history.rst | head -n 1000 > $DOCSDIR/history.rst - touch -r docs/history.rst $DOCSDIR/history.rst -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-setuptools-opt/python3-setuptools-opt.info b/python/python3-setuptools-opt/python3-setuptools-opt.info deleted file mode 100644 index d15ebfec11..0000000000 --- a/python/python3-setuptools-opt/python3-setuptools-opt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-setuptools-opt" -VERSION="80.9.0" -HOMEPAGE="https://pypi.org/project/setuptools/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-80.9.0.tar.gz" -MD5SUM="82e1d67883b713f9493659b50d13b436" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-packaging-opt python3-wheel" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-setuptools-opt/setuptools.x86_64.diff.gz b/python/python3-setuptools-opt/setuptools.x86_64.diff.gz deleted file mode 100644 index a04992ad7539148d51a2e0b42d5a236ed255088a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t20iwFP!000021ErH)Z`v>zg|C-iVX=#V^8EpAB28kNDy>pCA+eiYS%w(! zme`hUwnh>Ey$&u-=%8wgFB03apA(<=*z-K#2NJ6-SB#Z1fCZ6itBCH(S}qw~k+sij zp9!-56o+x_h1XsjfiTX)aULapcxb>2$6;tWj`JpB9~LEflH}vqze=vNNtQ(8C)jif zyf{hSE8v*dbZUWqE6JiD0(=2$tdLS-s3lx5;3ZP#(?E}OZ!qfi;ZoxK81os-wgQ7$ ztu~BW-bsZ$#&XVno1}vdN-AFB3RC@4gi*c1<~6TvKvv*(4rlkX`~7dU)2*a!^_gZ) zZ(`EtNNxPzjL;z$ctsxECsFsMgwt98%~tpq3#liEqu#NFE{UK3awf?G)RduAh!#i` z?ZEAXU4W4&Yj_Ye?~&!bl9eT^Dh&$=)zGp$m6)?del0Qob6+BL2qQm>vTTxONk2Cx zHqWWC!0pfZudjD^aQ^N4&5xV8_O~(a*v1lbPCM7r&k3-(&V_bH&)UrbNxTd6C}@t& zhb8-m#jfG?!Feb*OsHKTiNYR7%Rgw1rR{d{ISrnqA4h`@ZPLF-w|#?ex=XP;qtc6^ z{Vv4~MulG6I}D-Aa$DfDLT!c8q^;2Y*}vCzffVXc2ceyNRILrG@CCKHpcZGne!I_? hco#J7^?(#r_!uOYf^gLbEeO>s9s#@MBxB?S000Kt3#9-6 diff --git a/python/python3-setuptools-opt/slack-desc b/python/python3-setuptools-opt/slack-desc deleted file mode 100644 index 53ddd75f55..0000000000 --- a/python/python3-setuptools-opt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-setuptools-opt: python3-setuptools-opt (Install setuptools from -current in /opt) -python3-setuptools-opt: -python3-setuptools-opt: Setuptools is a fully-featured, actively-maintained, and stable -python3-setuptools-opt: library designed to facilitate packaging Python projects. -python3-setuptools-opt: -python3-setuptools-opt: Installs to /opt/python$PYVER/site-packages -python3-setuptools-opt: -python3-setuptools-opt: -python3-setuptools-opt: Project URL: https://pypi.org/project/setuptools/ -python3-setuptools-opt: -python3-setuptools-opt: diff --git a/python/python3-setuptools-scm-opt/README b/python/python3-setuptools-scm-opt/README deleted file mode 100644 index 9affc3e333..0000000000 --- a/python/python3-setuptools-scm-opt/README +++ /dev/null @@ -1,17 +0,0 @@ -python3-setuptools-scm-opt (setuptools-scm installed to /opt) - -setuptools_scm extracts Python package versions from git or hg -metadata instead of declaring them as the version argument or in a SCM -managed file. - -# Build your package with this version to fix errors like the following: -ImportError: cannot import name '__version__' from ... - -NOTE: -Installs to /opt/python$PYVER/site-packages - -Add the following before the python3 build commands in your -Slackbuild to use this version over the stock one in 15.0: - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages diff --git a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild b/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild deleted file mode 100644 index 3824e3ede6..0000000000 --- a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-setuptools-scm-opt - -# Copyright 2023-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-setuptools-scm-opt -SRCNAM=setuptools_scm -VERSION=${VERSION:-8.3.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -# set noarch because installing to /opt -ARCH=noarch - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -# remove upper version limit if python3-tomli-opt is installed -sed -i '/tomli<=2.0.2/d' pyproject.toml - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -if [ "$PKG/usr/" != "/usr/" ]; then - mkdir -p $PKG/opt - mv $PKG/usr/lib*/python$PYVER $PKG/opt/ - rmdir $PKG/usr/lib* -else - echo "ERROR: \$PKG is not set! We don't want to move the real /usr/lib*/python$PYVER" - exit 1 -fi - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG.md LICENSE README.md PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info b/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info deleted file mode 100644 index 831a4d7f4e..0000000000 --- a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-setuptools-scm-opt" -VERSION="8.3.1" -HOMEPAGE="https://github.com/pypa/setuptools-scm" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-8.3.1.tar.gz" -MD5SUM="35e09656d091a94b27f9c50b383b32c5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-typing-extensions python-importlib_metadata" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-setuptools-scm-opt/slack-desc b/python/python3-setuptools-scm-opt/slack-desc deleted file mode 100644 index 5a43ac0548..0000000000 --- a/python/python3-setuptools-scm-opt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-setuptools-scm-opt: python3-setuptools-scm-opt (setuptools-scm installed to /opt) -python3-setuptools-scm-opt: -python3-setuptools-scm-opt: setuptools_scm extracts Python package versions from git or hg -python3-setuptools-scm-opt: metadata instead of declaring them as the version argument or in a SCM -python3-setuptools-scm-opt: managed file. -python3-setuptools-scm-opt: -python3-setuptools-scm-opt: -python3-setuptools-scm-opt: -python3-setuptools-scm-opt: -python3-setuptools-scm-opt: Homepage: https://github.com/pypa/setuptools_scm -python3-setuptools-scm-opt: diff --git a/python/python3-setuptools_scm_git_archive/README b/python/python3-setuptools_scm_git_archive/README deleted file mode 100644 index 3b39308c01..0000000000 --- a/python/python3-setuptools_scm_git_archive/README +++ /dev/null @@ -1,5 +0,0 @@ -This is a setuptools_scm plugin that adds support for git archives, -for example the ones GitHub automatically generates. - -Note that it only works for archives of tagged commits, because git -currently lacks a format option equivalent to git describe --tags. diff --git a/python/python3-setuptools_scm_git_archive/python3-setuptools_scm_git_archive.SlackBuild b/python/python3-setuptools_scm_git_archive/python3-setuptools_scm_git_archive.SlackBuild deleted file mode 100644 index 934d79874a..0000000000 --- a/python/python3-setuptools_scm_git_archive/python3-setuptools_scm_git_archive.SlackBuild +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# SlackBuild script for python3-setuptools_scm_git_archive. -# Yth | Pont-en-Royans, France | yth@ythogtha.org - -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-setuptools_scm_git_archive -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.4.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python3 setup.py install --root=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-setuptools_scm_git_archive/python3-setuptools_scm_git_archive.info b/python/python3-setuptools_scm_git_archive/python3-setuptools_scm_git_archive.info deleted file mode 100644 index b2c4fcaf28..0000000000 --- a/python/python3-setuptools_scm_git_archive/python3-setuptools_scm_git_archive.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-setuptools_scm_git_archive" -VERSION="1.4.1" -HOMEPAGE="https://github.com/Changaco/setuptools_scm_git_archive/" -DOWNLOAD="https://pypi.python.org/packages/source/s/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.1.tar.gz" -MD5SUM="cfcdab6edbe6b710ab24ad355e7cf7a3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Yth - Arnaud" -EMAIL="yth@ythogtha.org" diff --git a/python/python3-setuptools_scm_git_archive/slack-desc b/python/python3-setuptools_scm_git_archive/slack-desc deleted file mode 100644 index f9dadcc9ee..0000000000 --- a/python/python3-setuptools_scm_git_archive/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-setuptools_scm_git_archive: python3-setuptools_scm_git_archive (scm plugin) -python3-setuptools_scm_git_archive: -python3-setuptools_scm_git_archive: This is a setuptools_scm plugin that adds support for git archives -python3-setuptools_scm_git_archive: For example the ones GitHub automatically generates -python3-setuptools_scm_git_archive: -python3-setuptools_scm_git_archive: -python3-setuptools_scm_git_archive: -python3-setuptools_scm_git_archive: -python3-setuptools_scm_git_archive: https://github.com/Changaco/setuptools_scm_git_archive/ -python3-setuptools_scm_git_archive: -python3-setuptools_scm_git_archive: diff --git a/python/python3-statsmodels/python3-statsmodels.SlackBuild b/python/python3-statsmodels/python3-statsmodels.SlackBuild index 524e44afa1..5919d459dc 100644 --- a/python/python3-statsmodels/python3-statsmodels.SlackBuild +++ b/python/python3-statsmodels/python3-statsmodels.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-statsmodels -VERSION=${VERSION:-0.14.1} +VERSION=${VERSION:-0.14.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -68,8 +68,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# remove requirement -sed -i '/oldest-supported-numpy/d' pyproject.toml +sed -i "s/setuptools_scm\[toml]>=8,<9/setuptools_scm>=8/g" pyproject.toml PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') export PYTHONPATH=/opt/python$PYVER/site-packages/ diff --git a/python/python3-statsmodels/python3-statsmodels.info b/python/python3-statsmodels/python3-statsmodels.info index 8224e87e97..cf1630237e 100644 --- a/python/python3-statsmodels/python3-statsmodels.info +++ b/python/python3-statsmodels/python3-statsmodels.info @@ -1,8 +1,8 @@ PRGNAM="python3-statsmodels" -VERSION="0.14.1" +VERSION="0.14.4" HOMEPAGE="https://www.statsmodels.org" -DOWNLOAD="https://pypi.python.org/packages/source/s/statsmodels/statsmodels-0.14.1.tar.gz" -MD5SUM="4e0f1ecd898349d9f23ee496bb6ba7ba" +DOWNLOAD="https://files.pythonhosted.org/packages/source/s/statsmodels/statsmodels-0.14.4.tar.gz" +MD5SUM="38acb6af5decb5abea4721b6481ddb1b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-pandas python3-patsy python3-scipy python3-setuptools-scm-opt" diff --git a/python/python3-tomli-opt/README b/python/python3-tomli-opt/README deleted file mode 100644 index 3e9ab442fb..0000000000 --- a/python/python3-tomli-opt/README +++ /dev/null @@ -1,4 +0,0 @@ -python3-tomli-opt (A lil' TOML parser) - -Tomli is a Python library for parsing TOML. -(Only needed for python <3.11) diff --git a/python/python3-tomli-opt/python3-tomli-opt.SlackBuild b/python/python3-tomli-opt/python3-tomli-opt.SlackBuild deleted file mode 100644 index c40f186e58..0000000000 --- a/python/python3-tomli-opt/python3-tomli-opt.SlackBuild +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-tomli-opt - -# Copyright 2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-tomli-opt -SRCNAM=tomli -VERSION=${VERSION:-2.2.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -# set noarch because installing to /opt -ARCH=noarch - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') - -python3 -m flit_core.wheel -python3 -m installer -d "$PKG" dist/*.whl - -if [ "$PKG/usr/" != "/usr/" ]; then - mkdir -p $PKG/opt - mv $PKG/usr/lib*/python$PYVER $PKG/opt/ - rmdir $PKG/usr/lib* -else - echo "ERROR: \$PKG is not set! We don't want to move the real /usr/lib*/python$PYVER" - exit 1 -fi - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE PKG-INFO README.* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-tomli-opt/python3-tomli-opt.info b/python/python3-tomli-opt/python3-tomli-opt.info deleted file mode 100644 index 52d3c0e4be..0000000000 --- a/python/python3-tomli-opt/python3-tomli-opt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-tomli-opt" -VERSION="2.2.1" -HOMEPAGE="https://github.com/hukkin/tomli" -DOWNLOAD="https://files.pythonhosted.org/packages/source/t/tomli/tomli-2.2.1.tar.gz" -MD5SUM="1e0e2fb2e29f3d77f0507bee71fb4ab4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-installer" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-tomli-opt/slack-desc b/python/python3-tomli-opt/slack-desc deleted file mode 100644 index 9d3ab9824c..0000000000 --- a/python/python3-tomli-opt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-tomli-opt: python3-tomli-opt (A lil' TOML parser) -python3-tomli-opt: -python3-tomli-opt: Tomli is a Python library for parsing TOML. -python3-tomli-opt: (Only needed for python <3.11) -python3-tomli-opt: -python3-tomli-opt: Homepage: https://github.com/hukkin/tomli -python3-tomli-opt: -python3-tomli-opt: -python3-tomli-opt: -python3-tomli-opt: -python3-tomli-opt: diff --git a/python/python3-tomli_w/README b/python/python3-tomli_w/README deleted file mode 100644 index ed35b90bb1..0000000000 --- a/python/python3-tomli_w/README +++ /dev/null @@ -1,5 +0,0 @@ -python3-tomli_w (A lil TOML writer) - -Tomli-W is a Python library for writing TOML. It is a write-only -counterpart to Tomli, which is a read-only TOML parser. Tomli-W is -fully compatible with TOML v1.0.0. diff --git a/python/python3-tomli_w/python3-tomli_w.SlackBuild b/python/python3-tomli_w/python3-tomli_w.SlackBuild deleted file mode 100644 index 9a9c465431..0000000000 --- a/python/python3-tomli_w/python3-tomli_w.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-tomli_w - -# Copyright 2022-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-tomli_w -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.2.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -python3 -m flit_core.wheel -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-tomli_w/python3-tomli_w.info b/python/python3-tomli_w/python3-tomli_w.info deleted file mode 100644 index 4ef1a7185e..0000000000 --- a/python/python3-tomli_w/python3-tomli_w.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-tomli_w" -VERSION="1.2.0" -HOMEPAGE="https://github.com/hukkin/tomli-w" -DOWNLOAD="https://files.pythonhosted.org/packages/source/t/tomli_w/tomli_w-1.2.0.tar.gz" -MD5SUM="bfc49ccce117afc20bcaf50e80fcecfe" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-installer" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-tomli_w/slack-desc b/python/python3-tomli_w/slack-desc deleted file mode 100644 index 6030fc98ea..0000000000 --- a/python/python3-tomli_w/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-tomli_w: python3-tomli_w (A lil TOML writer) -python3-tomli_w: -python3-tomli_w: Tomli-W is a Python library for writing TOML. It is a write-only -python3-tomli_w: counterpart to Tomli, which is a read-only TOML parser. Tomli-W is -python3-tomli_w: fully compatible with TOML v1.0.0. -python3-tomli_w: -python3-tomli_w: -python3-tomli_w: -python3-tomli_w: Homepage: https://github.com/hukkin/tomli-w -python3-tomli_w: -python3-tomli_w: diff --git a/python/python3-trove-classifiers/README b/python/python3-trove-classifiers/README deleted file mode 100644 index 99c4a0202f..0000000000 --- a/python/python3-trove-classifiers/README +++ /dev/null @@ -1,4 +0,0 @@ -python3-trove-classifiers (Canonical source for classifiers on PyPI) - -Classifiers categorize projects per PEP 301. Use this package to -validate classifiers in packages for PyPI upload or download. diff --git a/python/python3-trove-classifiers/python3-trove-classifiers.SlackBuild b/python/python3-trove-classifiers/python3-trove-classifiers.SlackBuild deleted file mode 100644 index f64dd2c20b..0000000000 --- a/python/python3-trove-classifiers/python3-trove-classifiers.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-trove-classifiers - -# Copyright 2023-2025 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-trove-classifiers -SRCNAM=trove_classifiers -VERSION=${VERSION:-2025.9.11.17} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -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 CONTRIBUTING.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-trove-classifiers/python3-trove-classifiers.info b/python/python3-trove-classifiers/python3-trove-classifiers.info deleted file mode 100644 index a560bd836b..0000000000 --- a/python/python3-trove-classifiers/python3-trove-classifiers.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-trove-classifiers" -VERSION="2025.9.11.17" -HOMEPAGE="https://github.com/pypa/trove-classifiers" -DOWNLOAD="https://files.pythonhosted.org/packages/source/t/trove_classifiers/trove_classifiers-2025.9.11.17.tar.gz" -MD5SUM="769cd978e6756c423958bbfe76f130d8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-calver" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-trove-classifiers/slack-desc b/python/python3-trove-classifiers/slack-desc deleted file mode 100644 index 7d5b42c647..0000000000 --- a/python/python3-trove-classifiers/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-trove-classifiers: python3-trove-classifiers (Canonical source for classifiers on PyPI) -python3-trove-classifiers: -python3-trove-classifiers: Classifiers categorize projects per PEP 301. Use this package to -python3-trove-classifiers: validate classifiers in packages for PyPI upload or download. -python3-trove-classifiers: -python3-trove-classifiers: Homepage: https://github.com/pypa/trove-classifiers -python3-trove-classifiers: -python3-trove-classifiers: -python3-trove-classifiers: -python3-trove-classifiers: -python3-trove-classifiers: diff --git a/python/python3-typogrify/README b/python/python3-typogrify/README deleted file mode 100644 index 7b85ea97e3..0000000000 --- a/python/python3-typogrify/README +++ /dev/null @@ -1,5 +0,0 @@ -Typogrify provides a set of custom filters that automatically apply -various transformations to plain text in order to yield -typographically-improved HTML. While often used in conjunction with -Jinja and Django template systems, the filters can be used in any -environment. diff --git a/python/python3-typogrify/python3-typogrify.SlackBuild b/python/python3-typogrify/python3-typogrify.SlackBuild deleted file mode 100644 index e504fd7071..0000000000 --- a/python/python3-typogrify/python3-typogrify.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-typogrify - -# Copyright 2022 Steven Voges -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-typogrify -SRCNAM=typogrify -VERSION=${VERSION:-2.0.7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - LICENSE.txt PKG-INFO README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-typogrify/python3-typogrify.info b/python/python3-typogrify/python3-typogrify.info deleted file mode 100644 index 8d9d21e089..0000000000 --- a/python/python3-typogrify/python3-typogrify.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-typogrify" -VERSION="2.0.7" -HOMEPAGE="https://github.com/mintchaos/typogrify" -DOWNLOAD="https://files.pythonhosted.org/packages/8a/bf/64959d6187d42472acb846bcf462347c9124952c05bd57e5769d5f28f9a6/typogrify-2.0.7.tar.gz" -MD5SUM="63f38f80531996f187d2894cc497ba08" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python-smartypants" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/python/python3-typogrify/slack-desc b/python/python3-typogrify/slack-desc deleted file mode 100644 index f8a55e6af9..0000000000 --- a/python/python3-typogrify/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-typogrify: python3-typogrify (Text to HTML translator) -python3-typogrify: -python3-typogrify: A set of Django template filters to make caring about typography on -python3-typogrify: the web a bit easier. -python3-typogrify: -python3-typogrify: Homepage: https://github.com/mintchaos/typogrify -python3-typogrify: -python3-typogrify: -python3-typogrify: -python3-typogrify: -python3-typogrify: diff --git a/python/python3-versioneer/README b/python/python3-versioneer/README deleted file mode 100644 index d4bf39dc44..0000000000 --- a/python/python3-versioneer/README +++ /dev/null @@ -1,7 +0,0 @@ -python3-versioneer (Easy VCS-based mgt of project version strings) - -This is a tool for managing a recorded version number in -setuptools-based python projects. The goal is to remove the tedious -and error-prone "update the embedded version string" step from your -release process. Making a new release should be as easy as recording a -new tag in your version-control system, and maybe making new tarballs diff --git a/python/python3-versioneer/python3-versioneer.SlackBuild b/python/python3-versioneer/python3-versioneer.SlackBuild deleted file mode 100644 index 974f9f62ff..0000000000 --- a/python/python3-versioneer/python3-versioneer.SlackBuild +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-versioneer - -# Copyright 2023-2024 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-versioneer -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.29} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - LICENSE README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-versioneer/python3-versioneer.info b/python/python3-versioneer/python3-versioneer.info deleted file mode 100644 index 65b537e11c..0000000000 --- a/python/python3-versioneer/python3-versioneer.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-versioneer" -VERSION="0.29" -HOMEPAGE="https://github.com/python-versioneer/python-versioneer" -DOWNLOAD="https://files.pythonhosted.org/packages/source/v/versioneer/versioneer-0.29.tar.gz" -MD5SUM="1703d6ced3656553066fa71e42c5eee6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build python3-wheel" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-versioneer/slack-desc b/python/python3-versioneer/slack-desc deleted file mode 100644 index 6e440ae9f1..0000000000 --- a/python/python3-versioneer/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-versioneer: python3-versioneer (Easy VCS-based mgt of project version strings) -python3-versioneer: -python3-versioneer: This is a tool for managing a recorded version number in -python3-versioneer: setuptools-based python projects. The goal is to remove the tedious -python3-versioneer: and error-prone "update the embedded version string" step from your -python3-versioneer: release process. Making a new release should be as easy as recording a -python3-versioneer: new tag in your version-control system, and maybe making new tarballs -python3-versioneer: -python3-versioneer: Homepage: https://github.com/python-versioneer/python-versioneer -python3-versioneer: -python3-versioneer: diff --git a/python/python3-webencodings/README b/python/python3-webencodings/README deleted file mode 100644 index 736e9a2870..0000000000 --- a/python/python3-webencodings/README +++ /dev/null @@ -1,13 +0,0 @@ -webencodings is a Python implementation of the WHATWG Encoding standard. - -In order to be compatible with legacy web content when interpreting -something like Content-Type: text/html; charset=latin1, tools need to -use a particular set of aliases for encoding labels as well as some -overriding rules. For example, US-ASCII and iso-8859-1 on the web are -actually aliases for windows-1252, and an UTF-8 or UTF-16 BOM takes -precedence over any other encoding declaration. The Encoding standard -defines all such details so that implementations do not have to -reverse-engineer each other. - -This module has encoding labels and BOM detection, but the actual -implementation for encoders and decoders is Python's. diff --git a/python/python3-webencodings/python3-webencodings.SlackBuild b/python/python3-webencodings/python3-webencodings.SlackBuild deleted file mode 100644 index 91b1c7be84..0000000000 --- a/python/python3-webencodings/python3-webencodings.SlackBuild +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash -# -# SlackBuild for python3-webencodings - -# Copyright 2021 Yth | Pont-en-Royans, France | yth@ythogtha.org -# Copyright 2017-2021 Benjamin Trigona-Harany -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-webencodings -SRCNAM=python-webencodings -VERSION=${VERSION:-0.5.1} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - 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 xzf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-webencodings/python3-webencodings.info b/python/python3-webencodings/python3-webencodings.info deleted file mode 100644 index cdd96149be..0000000000 --- a/python/python3-webencodings/python3-webencodings.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-webencodings" -VERSION="0.5.1" -HOMEPAGE="https://pythonhosted.org/webencodings/" -DOWNLOAD="https://github.com/gsnedders/python-webencodings/archive/v0.5.1/python-webencodings-0.5.1.tar.gz" -MD5SUM="7eb67377743cd55eaa356496c439471e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Yth - Arnaud" -EMAIL="yth@ythogtha.org" diff --git a/python/python3-webencodings/slack-desc b/python/python3-webencodings/slack-desc deleted file mode 100644 index 2b41d21154..0000000000 --- a/python/python3-webencodings/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-webencodings: python3-webencodings (Character encoding for the web) -python3-webencodings: -python3-webencodings: webencodings is a Python implementation of the WHATWG Encoding -python3-webencodings: standard. -python3-webencodings: -python3-webencodings: -python3-webencodings: -python3-webencodings: -python3-webencodings: -python3-webencodings: -python3-webencodings: diff --git a/python/python3-wheel/README b/python/python3-wheel/README deleted file mode 100644 index d64f5dca0a..0000000000 --- a/python/python3-wheel/README +++ /dev/null @@ -1,6 +0,0 @@ -python3-wheel (A built-package format for Python) - -This library is the reference implementation of the Python wheel -packaging standard, as defined in PEP 427. - -Optional dependencies: python-keyring diff --git a/python/python3-wheel/python3-wheel.SlackBuild b/python/python3-wheel/python3-wheel.SlackBuild deleted file mode 100644 index ba5dd74bb6..0000000000 --- a/python/python3-wheel/python3-wheel.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-wheel - -# Copyright 2023-2024 fourtysixandtwo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-wheel -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.45.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m flit_core.wheel -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst LICENSE.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 diff --git a/python/python3-wheel/python3-wheel.info b/python/python3-wheel/python3-wheel.info deleted file mode 100644 index 929cf0fab1..0000000000 --- a/python/python3-wheel/python3-wheel.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-wheel" -VERSION="0.45.1" -HOMEPAGE="https://github.com/pypa/wheel" -DOWNLOAD="https://files.pythonhosted.org/packages/source/w/wheel/wheel-0.45.1.tar.gz" -MD5SUM="dddc505d0573d03576c7c6c5a4fe0641" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-installer" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-wheel/slack-desc b/python/python3-wheel/slack-desc deleted file mode 100644 index 2e875b9718..0000000000 --- a/python/python3-wheel/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-wheel: python3-wheel (A built-package format for Python) -python3-wheel: -python3-wheel: This library is the reference implementation of the Python wheel -python3-wheel: packaging standard, as defined in PEP 427. -python3-wheel: -python3-wheel: Homepage: https://wheel.readthedocs.io -python3-wheel: -python3-wheel: -python3-wheel: -python3-wheel: -python3-wheel: diff --git a/python/snowballstemmer/snowballstemmer.SlackBuild b/python/snowballstemmer/snowballstemmer.SlackBuild index 805761b599..7e3a58571d 100644 --- a/python/snowballstemmer/snowballstemmer.SlackBuild +++ b/python/snowballstemmer/snowballstemmer.SlackBuild @@ -81,7 +81,6 @@ find -L . \ # Build python setup.py install --root=$PKG -python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/sphinx-rtd-theme/README b/python/sphinx-rtd-theme/README deleted file mode 100644 index 6612eac0f6..0000000000 --- a/python/sphinx-rtd-theme/README +++ /dev/null @@ -1,7 +0,0 @@ -The sphinx_rtd_theme is a sphinx theme designed to look modern and be -mobile-friendly. - -This theme is primarily focused to be used on readthedocs.org but can -work with your own sphinx projects. - -To read more and see a working demo head over to readthedocs.org. diff --git a/python/sphinx-rtd-theme/slack-desc b/python/sphinx-rtd-theme/slack-desc deleted file mode 100644 index b8e2b0cd25..0000000000 --- a/python/sphinx-rtd-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------------------------------------------------------| -sphinx-rtd-theme: sphinx-rtd-theme (decorator for caching properties in classes) -sphinx-rtd-theme: -sphinx-rtd-theme: The sphinx_rtd_theme is a sphinx theme designed to look modern and be -sphinx-rtd-theme: mobile-friendly. -sphinx-rtd-theme: -sphinx-rtd-theme: -sphinx-rtd-theme: Homepage: https://pypi.org/project/sphinx-rtd-theme -sphinx-rtd-theme: -sphinx-rtd-theme: -sphinx-rtd-theme: -sphinx-rtd-theme: diff --git a/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild b/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild deleted file mode 100644 index 2a8ceb724d..0000000000 --- a/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# SlackBuild build script for sphinx_rtd_theme - -# Copyright 2024 fourtysixandtwo -# Copyright (c) 2000-2011 Pr. Horstmann -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240322 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinx-rtd-theme -VERSION=${VERSION:-2.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCNAM=$( printf $PRGNAM | tr - _ ) - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 setup.py install --root=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinx-rtd-theme/sphinx-rtd-theme.info b/python/sphinx-rtd-theme/sphinx-rtd-theme.info deleted file mode 100644 index fe6c57ad95..0000000000 --- a/python/sphinx-rtd-theme/sphinx-rtd-theme.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinx-rtd-theme" -VERSION="2.0.0" -HOMEPAGE="https://pypi.org/project/sphinx-rtd-theme" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinx_rtd_theme/sphinx_rtd_theme-2.0.0.tar.gz" -MD5SUM="8ad74a8e9ca706ed77117be0e9eed7e8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="sphinxcontrib-jquery" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-applehelp/README b/python/sphinxcontrib-applehelp/README deleted file mode 100644 index eda7fa9b74..0000000000 --- a/python/sphinxcontrib-applehelp/README +++ /dev/null @@ -1,2 +0,0 @@ -sphinxcontrib-applehelp is a Sphinx extension to create Apple help -books. diff --git a/python/sphinxcontrib-applehelp/slack-desc b/python/sphinxcontrib-applehelp/slack-desc deleted file mode 100644 index 5a5f518716..0000000000 --- a/python/sphinxcontrib-applehelp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-applehelp: sphinxcontrib-applehelp (Sphinx extension) -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: sphinxcontrib-applehelp is a Sphinx extension to create Apple help -sphinxcontrib-applehelp: books. -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: diff --git a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild b/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild deleted file mode 100644 index a6744d52f7..0000000000 --- a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-applehelp - -# Copyright 2024 fourtysixandtwo -# Copyright 2019-2021 Benjamin Trigona-Harany -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-applehelp -SRCNAM=sphinxcontrib_applehelp -VERSION=${VERSION:-2.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES.rst LICENCE.rst README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info b/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info deleted file mode 100644 index c2bbb9b9de..0000000000 --- a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-applehelp" -VERSION="2.0.0" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-applehelp" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/sphinxcontrib_applehelp-2.0.0.tar.gz" -MD5SUM="e16bb1d6199f686d411c180e64a8e831" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-devhelp/README b/python/sphinxcontrib-devhelp/README deleted file mode 100644 index abffcbb5ee..0000000000 --- a/python/sphinxcontrib-devhelp/README +++ /dev/null @@ -1,2 +0,0 @@ -sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp -document. diff --git a/python/sphinxcontrib-devhelp/slack-desc b/python/sphinxcontrib-devhelp/slack-desc deleted file mode 100644 index b312071fe8..0000000000 --- a/python/sphinxcontrib-devhelp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-devhelp: sphinxcontrib-devhelp (Sphinx extension) -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp -sphinxcontrib-devhelp: document. -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: diff --git a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild b/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild deleted file mode 100644 index cae7939ddc..0000000000 --- a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-devhelp - -# Copyright 2024 fourtysixandtwo -# Copyright 2019-2020 Benjamin Trigona-Harany -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-devhelp -SRCNAM=sphinxcontrib_devhelp -VERSION=${VERSION:-2.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES.rst LICENCE.rst README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info b/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info deleted file mode 100644 index c069a9ace8..0000000000 --- a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-devhelp" -VERSION="2.0.0" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-devhelp" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib_devhelp-2.0.0.tar.gz" -MD5SUM="79ef5937b8397f724f4fb065073cd24c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-htmlhelp/README b/python/sphinxcontrib-htmlhelp/README deleted file mode 100644 index ffefb74a48..0000000000 --- a/python/sphinxcontrib-htmlhelp/README +++ /dev/null @@ -1 +0,0 @@ -sphinxcontrib-htmlhelp is a Sphinx extension to create HTML help files. diff --git a/python/sphinxcontrib-htmlhelp/slack-desc b/python/sphinxcontrib-htmlhelp/slack-desc deleted file mode 100644 index 41edc47af2..0000000000 --- a/python/sphinxcontrib-htmlhelp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-htmlhelp: sphinxcontrib-htmlhelp (HTML help file generator) -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: sphinxcontrib-htmlhelp is a Sphinx extension to create HTML help -sphinxcontrib-htmlhelp: files. -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: diff --git a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild b/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild deleted file mode 100644 index 0e1453ad64..0000000000 --- a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-htmlhelp - -# Copyright 2024 fourtysixandtwo -# Copyright 2019-2021 Benjamin Trigona-Harany -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-htmlhelp -SRCNAM=sphinxcontrib_htmlhelp -VERSION=${VERSION:-2.1.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES.rst LICENCE.rst README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info b/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info deleted file mode 100644 index 56bd5d98c4..0000000000 --- a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-htmlhelp" -VERSION="2.1.0" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-htmlhelp" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib_htmlhelp-2.1.0.tar.gz" -MD5SUM="1326f55f6bea49ab6a846c0088bc369e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-jsmath/README b/python/sphinxcontrib-jsmath/README deleted file mode 100644 index 935d4aca13..0000000000 --- a/python/sphinxcontrib-jsmath/README +++ /dev/null @@ -1,2 +0,0 @@ -sphinxcontrib-jsmath is a Sphinx extension which renders display math -in HTML via JavaScript. diff --git a/python/sphinxcontrib-jsmath/slack-desc b/python/sphinxcontrib-jsmath/slack-desc deleted file mode 100644 index c391e43d79..0000000000 --- a/python/sphinxcontrib-jsmath/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-jsmath: sphinxcontrib-jsmath (Sphinx extension) -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: sphinxcontrib-jsmath is a Sphinx extension which renders display math -sphinxcontrib-jsmath: in HTML via JavaScript -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: diff --git a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.SlackBuild b/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.SlackBuild deleted file mode 100644 index 710a2cf4cc..0000000000 --- a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.SlackBuild +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-jsmath - -# Copyright 2024 fourtysixandtwo -# Copyright 2019 Benjamin Trigona-Harany -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: New maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-jsmath -VERSION=${VERSION:-1.0.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \+ - -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES LICENSE README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.info b/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.info deleted file mode 100644 index a37ebf4e7c..0000000000 --- a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-jsmath" -VERSION="1.0.1" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-jsmath" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz" -MD5SUM="e45179f0a3608b6766862e0f34c23b62" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-qthelp/README b/python/sphinxcontrib-qthelp/README deleted file mode 100644 index 4b2719c2d4..0000000000 --- a/python/sphinxcontrib-qthelp/README +++ /dev/null @@ -1,2 +0,0 @@ -sphinxcontrib-qthelp is a Sphinx extension to create QtHelp -documentation. diff --git a/python/sphinxcontrib-qthelp/slack-desc b/python/sphinxcontrib-qthelp/slack-desc deleted file mode 100644 index 82af3befe0..0000000000 --- a/python/sphinxcontrib-qthelp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-qthelp: sphinxcontrib-qthelp (QtHelp documentation generation) -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: sphinxcontrib-qthelp is a Sphinx extension to create QtHelp -sphinxcontrib-qthelp: documentation. -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: diff --git a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild b/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild deleted file mode 100644 index d28383379a..0000000000 --- a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-qthelp - -# Copyright 2024 fourtysixandtwo -# Copyright 2019-2020 Benjamin Trigona-Harany -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-qthelp -SRCNAM=sphinxcontrib_qthelp -VERSION=${VERSION:-2.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES.rst LICENCE.rst README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info b/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info deleted file mode 100644 index a193b74ca0..0000000000 --- a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-qthelp" -VERSION="2.0.0" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-qthelp" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib_qthelp-2.0.0.tar.gz" -MD5SUM="ed4f32003b71a54ac3d68aa651cb6573" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-serializinghtml/README b/python/sphinxcontrib-serializinghtml/README deleted file mode 100644 index 795e6d8f1d..0000000000 --- a/python/sphinxcontrib-serializinghtml/README +++ /dev/null @@ -1,2 +0,0 @@ -sphinxcontrib-serializinghtml is a sphinx extension which outputs -"serialized" HTML files (json and pickle). diff --git a/python/sphinxcontrib-serializinghtml/slack-desc b/python/sphinxcontrib-serializinghtml/slack-desc deleted file mode 100644 index b056ff25a1..0000000000 --- a/python/sphinxcontrib-serializinghtml/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-serializinghtml: sphinxcontrib-serializinghtml (Sphinx extension) -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: sphinxcontrib-serializinghtml is a sphinx extension which outputs -sphinxcontrib-serializinghtml: "serialized" HTML files (json and pickle). -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: diff --git a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild b/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild deleted file mode 100644 index ade81993f1..0000000000 --- a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-serializinghtml - -# Copyright 2024 fourtysixandtwo -# Copyright 2019-2020 Benjamin Trigona-Harany -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-serializinghtml -SRCNAM=sphinxcontrib_serializinghtml -VERSION=${VERSION:-2.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES.rst LICENCE.rst README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info b/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info deleted file mode 100644 index 6881a4a0c3..0000000000 --- a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-serializinghtml" -VERSION="2.0.0" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-serializinghtml" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-serializinghtml/sphinxcontrib_serializinghtml-2.0.0.tar.gz" -MD5SUM="b536ce248d5ca134a30018692a17c6ca" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/system/adobe-source-code-pro-font/README b/system/adobe-source-code-pro-font/README deleted file mode 100644 index 96d07bb301..0000000000 --- a/system/adobe-source-code-pro-font/README +++ /dev/null @@ -1,3 +0,0 @@ -Source Code Pro is a set of monospaced OpenType fonts that have been -designed to work well in coding environments. This family of fonts is -a complementary design to the Source Sans family. diff --git a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild deleted file mode 100644 index 9de871278c..0000000000 --- a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash - -# Slackware build script for adobe-source-code-pro-font - -# Copyright (c) 2012 Daniel LEVAI -# Copyright (c) 2012-2019 Dugan Chen -# Copyright (c) 2019-2023 Matteo Bernardini -# All rights reserved. -# -# * Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# * Redistributions of source code must retain the above copyright notice -# this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=adobe-source-code-pro-font -VERSION=${VERSION:-2.042} -ITALIC_VERSION=${ITALIC_VERSION:-1.062} -SRC=source-code-pro-${VERSION}R-u_${ITALIC_VERSION}R-i -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -ARCH=noarch - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 source-code-pro-${VERSION} -mkdir source-code-pro-${VERSION} -cd source-code-pro-${VERSION} -unzip $CWD/OTF-$SRC.zip -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p $PKG/usr/share/fonts/OTF/ -cp OTF/*.otf $PKG/usr/share/fonts/OTF/ - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info deleted file mode 100644 index d355f316e0..0000000000 --- a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="adobe-source-code-pro-font" -VERSION="2.042" -HOMEPAGE="http://adobe-fonts.github.io/source-code-pro/" -DOWNLOAD="https://github.com/adobe-fonts/source-code-pro/releases/download/2.042R-u%2F1.062R-i%2F1.026R-vf/OTF-source-code-pro-2.042R-u_1.062R-i.zip" -MD5SUM="6a214c6daba683ef7ae0bcc8f4bd2a7f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/system/adobe-source-code-pro-font/doinst.sh b/system/adobe-source-code-pro-font/doinst.sh deleted file mode 100644 index 522e1a9f94..0000000000 --- a/system/adobe-source-code-pro-font/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -# Update the X font indexes: -if [ -x /usr/bin/mkfontdir ]; then - /usr/bin/mkfontscale usr/share/fonts/OTF - /usr/bin/mkfontdir usr/share/fonts/OTF -fi -if [ -x /usr/bin/fc-cache ]; then - /usr/bin/fc-cache -f -fi - diff --git a/system/adobe-source-code-pro-font/slack-desc b/system/adobe-source-code-pro-font/slack-desc deleted file mode 100644 index abd1d7e935..0000000000 --- a/system/adobe-source-code-pro-font/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -adobe-source-code-pro-font: adobe-source-code-pro-font (monospaced font) -adobe-source-code-pro-font: -adobe-source-code-pro-font: Source Code Pro was designed by Paul D. Hunt as a companion to -adobe-source-code-pro-font: Source Sans. This complementary family was adapted from the Source -adobe-source-code-pro-font: design due to a request to create a monospaced version for coding -adobe-source-code-pro-font: applications. -adobe-source-code-pro-font: -adobe-source-code-pro-font: https://github.com/adobe/Source-Code-Pro -adobe-source-code-pro-font: -adobe-source-code-pro-font: -adobe-source-code-pro-font: diff --git a/system/afpfs-ng/afpfs-ng.SlackBuild b/system/afpfs-ng/afpfs-ng.SlackBuild index 6a289a46cd..4fafb68890 100644 --- a/system/afpfs-ng/afpfs-ng.SlackBuild +++ b/system/afpfs-ng/afpfs-ng.SlackBuild @@ -79,7 +79,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS -fcommon" \ +CFLAGS="$SLKCFLAGS -fcommon -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -Wno-return-mismatch -Wno-int-conversion" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/aterm/README b/system/aterm/README deleted file mode 100644 index a0724cf1eb..0000000000 --- a/system/aterm/README +++ /dev/null @@ -1,10 +0,0 @@ -aterm (old-school terminal emulator with nice visual effects) - -aterm is designed to provide pleasing visual effects while performing -such a mundane function as terminal emulation under X. It is largely -based on rxvt code. - -Note: aterm hasn't been maintained by its developers in decades. This -build is provided for completeness' sake (for someone trying to -recreate the late 90s AfterStep experience) but you'd be better off -using something like Slackware's rxvt-unicode, or even xterm. diff --git a/system/aterm/aterm.SlackBuild b/system/aterm/aterm.SlackBuild deleted file mode 100644 index cff2f883f1..0000000000 --- a/system/aterm/aterm.SlackBuild +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash - -# Slackware build script for aterm - -# Copyright 2006 Martin Lefebvre -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20241010 bkw: v1.0.1, BUILD=2 -# - take over maintenance. -# - fix build on 64-bit. -# - make the script actually exit if the binary doesn't get built. -# - add some patches: compile fix, security, and functionality. -# - don't install docs/menu with +x files. - -# Note: in Slackware 15.0, it compiles and runs, but we get this warning: -# command.c:1187:13: warning: ‘XKeycodeToKeysym’ is deprecated [-Wdeprecated-declarations] -# At some point, XKeycodeToKeysym may get removed from Xlib, in which -# case aterm will be removed from SBo, unless *you* send a patch to -# fix it (I don't love it enough to do the job myself, sorry). - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=aterm -VERSION=${VERSION:-1.0.1} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -# 20240713 bkw: this was missing before 1.0.1 build 2. build was -# failing on x86_64 and nobody ever noticed... -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 /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + - -sed -i 's%%%;s%I_PUSH,%TIOCPKT,%' src/command.c - -# patches from https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-terms/aterm -for i in $CWD/patches/*.diff; do - echo "===> applying: $( basename $i )" - patch -p1 < $i -done - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - --localstatedir=/var \ - --enable-transparency \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG -strip $PKG/usr/bin/$PRGNAM -gzip $PKG/usr/man/man1/$PRGNAM.1 - -PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKGDOC -chmod 644 doc/menu/* -cp -a ChangeLog doc/{Change*,FAQ,README*,menu} $PKGDOC -cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/aterm/aterm.info b/system/aterm/aterm.info deleted file mode 100644 index b3fa130720..0000000000 --- a/system/aterm/aterm.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="aterm" -VERSION="1.0.1" -HOMEPAGE="http://www.afterstep.org/aterm.php" -DOWNLOAD="http://downloads.sourceforge.net/aterm/aterm-1.0.1.tar.bz2" -MD5SUM="c2eede028e1011e0ec7035cf319c9b5a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/system/aterm/patches/01-display-security-issue.diff b/system/aterm/patches/01-display-security-issue.diff deleted file mode 100644 index e44c0b360d..0000000000 --- a/system/aterm/patches/01-display-security-issue.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- aterm-1.0.1/src/main.c 2007-08-01 16:08:29.000000000 +0200 -+++ aterm-1.0.1.new/src/main.c 2008-05-03 14:06:52.000000000 +0200 -@@ -2057,10 +2057,6 @@ - */ - get_options(argc, argv); - -- if( display_name == NULL ) -- if ((display_name = getenv("DISPLAY")) == NULL) -- display_name = ":0"; -- - #ifdef HAVE_AFTERSTEP - #ifdef MyArgs_IS_MACRO - MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) ); -@@ -2102,7 +2098,9 @@ - Xdisplay = XOpenDisplay(display_name); - - if (!Xdisplay) { -- print_error("can't open display %s", display_name); -+ print_error("can't open display %s", display_name?display_name: -+ getenv("DISPLAY")?getenv("DISPLAY"): -+ "as no -d given and DISPLAY not set"); - exit(EXIT_FAILURE); - } - /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */ diff --git a/system/aterm/patches/02-deadkeys.diff b/system/aterm/patches/02-deadkeys.diff deleted file mode 100644 index 958f40900b..0000000000 --- a/system/aterm/patches/02-deadkeys.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- aterm-1.0.1~/src/command.c 2006-06-26 20:01:20.000000000 +0200 -+++ aterm-1.0.1/src/command.c 2007-09-26 15:03:19.000000000 +0200 -@@ -1486,19 +1486,21 @@ - numlock_state = (ev->xkey.state & ModNumLockMask); /* numlock toggle */ - PrivMode((!numlock_state), PrivMode_aplKP); - } --#ifdef USE_XIM -+#if defined(USE_XIM) || !defined(NO_XLOCALE) - len = 0; -- if (Input_Context != NULL) { -- Status status_return; -+ if (!XFilterEvent(ev, *(&ev->xkey.window))) { -+ if (Input_Context != NULL) { -+ Status status_return; - -- kbuf[0] = '\0'; -- len = XmbLookupString(Input_Context, &ev->xkey, kbuf, -- sizeof(kbuf), &keysym, -- &status_return); -- } else { -- len = XLookupString(&ev->xkey, kbuf, -- sizeof(kbuf), &keysym, -- &compose); -+ kbuf[0] = '\0'; -+ len = XmbLookupString(Input_Context, &ev->xkey, kbuf, -+ sizeof(kbuf), &keysym, -+ &status_return); -+ } else { -+ len = XLookupString(&ev->xkey, kbuf, -+ sizeof(kbuf), &keysym, -+ &compose); -+ } - } - #else /* USE_XIM */ - len = XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, &compose); diff --git a/system/aterm/patches/03-dpy.diff b/system/aterm/patches/03-dpy.diff deleted file mode 100644 index fbe9800d21..0000000000 --- a/system/aterm/patches/03-dpy.diff +++ /dev/null @@ -1,28 +0,0 @@ -Resolve build failure. Patch from Fedora. - -Bug: https://bugs.gentoo.org/615836 - -diff -up aterm-1.0.1/src/main.c.orig aterm-1.0.1/src/main.c ---- aterm-1.0.1/src/main.c.orig 2011-02-19 09:12:01.000000000 +0200 -+++ aterm-1.0.1/src/main.c 2011-02-19 09:25:02.000000000 +0200 -@@ -2087,10 +2087,10 @@ main(int argc, char *argv[]) - #endif - - ConnectX ( &Scr, 0 ); -- Xdisplay = dpy ; -- Xscreen = Scr.screen ; -+ Xscreen = Scr.screen ; - asv = Scr.asv ; - -+ Xdisplay = asv->dpy; - Xcmap = asv->colormap; - Xdepth = asv->visual_info.depth; - Xvisual = asv->visual_info.visual; -@@ -2125,7 +2125,6 @@ main(int argc, char *argv[]) - XdisplayHeight = DisplayHeight (Xdisplay, Xscreen); - - #ifdef HAVE_AFTERIMAGE -- dpy = Xdisplay ; - asv = create_asvisual (Xdisplay, Xscreen, Xdepth, NULL); - Xcmap = asv->colormap; - Xdepth = asv->visual_info.depth; diff --git a/system/aterm/patches/05-configure-clang16.diff b/system/aterm/patches/05-configure-clang16.diff deleted file mode 100644 index 9faf68837d..0000000000 --- a/system/aterm/patches/05-configure-clang16.diff +++ /dev/null @@ -1,23 +0,0 @@ -Add missing int tpye, and avoid calling the undeclared exit function. -Implicit ints and function declarations are language features removed -in C99 and are likely to become unsupported (by default) in future -compilers. - ---- a/autoconf/configure.in -+++ b/autoconf/configure.in -@@ -615,12 +615,12 @@ - [#define X_LOCALE 1 - #include - #include --main() { -+int main() { - char *p; - if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) --exit (XSupportsLocale() ? 0 : 1); -+return XSupportsLocale() ? 0 : 1; - else --exit (1);} -+return 1;} - ],rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, - AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) - diff --git a/system/aterm/slack-desc b/system/aterm/slack-desc deleted file mode 100644 index 719c99bb75..0000000000 --- a/system/aterm/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -aterm: aterm (old-school terminal emulator with nice visual effects) -aterm: -aterm: aterm is designed to provide pleasing visual effects while performing -aterm: such a mundane function as terminal emulation under X. It is largely -aterm: based on rxvt code. -aterm: -aterm: Several points set it apart from similar apps: -aterm: * fast pseudo-transparency -aterm: * optional off-focus fading of text -aterm: * NeXT-ish scrollbar -aterm: diff --git a/system/audit/audit.SlackBuild b/system/audit/audit.SlackBuild index baf85c9b38..45aca7c2a1 100644 --- a/system/audit/audit.SlackBuild +++ b/system/audit/audit.SlackBuild @@ -79,6 +79,9 @@ find -L . \ # Init should check /etc/rc.d/rc.auditd.conf instead of /etc/sysconfig/auditd patch -p1 < $CWD/audit-2.3.6-sysconfig.diff +# python binding are disabled ATM, see +# https://listman.redhat.com/archives/linux-audit/2022-February/msg00085.html +# thanks to fourtysixandtwo for the pointers CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -94,6 +97,8 @@ CFLAGS="$SLKCFLAGS" \ --enable-systemd=no \ --with-libcap-ng=yes \ --enable-gssapi-krb5=yes \ + --without-python \ + --without-python3 \ --build=$ARCH-slackware-linux make diff --git a/system/bat/bat.SlackBuild b/system/bat/bat.SlackBuild index 5e4c1d29db..8b2b7a27e9 100644 --- a/system/bat/bat.SlackBuild +++ b/system/bat/bat.SlackBuild @@ -159,7 +159,7 @@ else fi CARGO_HOME=.cargo \ -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu17" \ CXXFLAGS="$SLKCFLAGS" \ cargo build --offline --release $CARGOTARGET diff --git a/system/brlaser/brlaser.SlackBuild b/system/brlaser/brlaser.SlackBuild index 8bad050070..96553aebff 100644 --- a/system/brlaser/brlaser.SlackBuild +++ b/system/brlaser/brlaser.SlackBuild @@ -80,6 +80,7 @@ cd build cmake \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/system/bubblewrap/bubblewrap.SlackBuild b/system/bubblewrap/bubblewrap.SlackBuild index aa7b7d59c8..c4eab07714 100644 --- a/system/bubblewrap/bubblewrap.SlackBuild +++ b/system/bubblewrap/bubblewrap.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bubblewrap -VERSION=${VERSION:-0.8.0} +VERSION=${VERSION:-0.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,19 +77,22 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG +mkdir build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + -Dstrip=true + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/system/bubblewrap/bubblewrap.info b/system/bubblewrap/bubblewrap.info index 6cd31ee9fd..ddfecf6e48 100644 --- a/system/bubblewrap/bubblewrap.info +++ b/system/bubblewrap/bubblewrap.info @@ -1,8 +1,8 @@ PRGNAM="bubblewrap" -VERSION="0.8.0" +VERSION="0.11.0" HOMEPAGE="https://github.com/containers/bubblewrap/" -DOWNLOAD="https://github.com/containers/bubblewrap/releases/download/v0.8.0/bubblewrap-0.8.0.tar.xz" -MD5SUM="fc0e14bc26df76225e8f8cc2df9fb657" +DOWNLOAD="https://github.com/containers/bubblewrap/releases/download/v0.11.0/bubblewrap-0.11.0.tar.xz" +MD5SUM="630eec714ea04729efd116ea85a715a3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ccid/README b/system/ccid/README deleted file mode 100644 index 8bea866444..0000000000 --- a/system/ccid/README +++ /dev/null @@ -1,11 +0,0 @@ -libccid provides a PC/SC IFD handler implementation for the USB -smart card drivers compliant to the Chip Card Interface Device (CCID) -protocol. - -This package is needed to communicate with the CCID smartcard readers -through the PC/SC Lite resource manager (pcscd). It also supports -various Gemplus serial smart card readers. - -You will need to edit the pcsc-lite config files to be able to use -serial smart card readers. The INSTALL file in the documentation -directory has all the details. diff --git a/system/ccid/ccid.SlackBuild b/system/ccid/ccid.SlackBuild deleted file mode 100644 index 64d95d061d..0000000000 --- a/system/ccid/ccid.SlackBuild +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/bash - -# Slackware build script for ccid - -# Copyright 2008 Andrew Psaltis -# Copyright 2014-2015 LukenShiro, 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. - -# Modified by Robby Workman -# 11 August 2008 -- Updated to version 1.3.8 (by Andrew Psaltis) - -# Modified by Daniel R. -# 05 October 2009 -- Updated to version 1.3.11 - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=ccid -VERSION=${VERSION:-1.4.36} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -DOCFILES="AUTHORS COPYING INSTALL README.md" - -set -e - -rm -rf $PKG $TMP/$PRGNAM-$VERSION -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -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 {} \; - -# --enable-udev flag is no longer supported -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-twinserial \ - --enable-static=no \ - --enable-composite-as-multislot \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Install the udev rules since this is not done automatically. -mkdir -p $PKG/lib/udev/rules.d -cat src/92_pcscd_ccid.rules > $PKG/lib/udev/rules.d/92_pcscd_ccid.rules - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \; - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -find $PKG -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 -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/ccid/ccid.info b/system/ccid/ccid.info deleted file mode 100644 index 84a021d1ae..0000000000 --- a/system/ccid/ccid.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ccid" -VERSION="1.4.36" -HOMEPAGE="https://ccid.apdu.fr/" -DOWNLOAD="https://ccid.apdu.fr/files/ccid-1.4.36.tar.bz2" -MD5SUM="3108dad76c08648bc253d9286630b0d1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="pcsc-lite" -MAINTAINER="LukenShiro" -EMAIL="lukenshiro@ngi.it" diff --git a/system/ccid/slack-desc b/system/ccid/slack-desc deleted file mode 100644 index 62504e28bf..0000000000 --- a/system/ccid/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -ccid: ccid (PC/SC driver for USB CCID smart card readers) -ccid: -ccid: libccid provides a PC/SC IFD handler implementation for the USB smart -ccid: card drivers compliant to the Card Chip Interface Device (CCID) -ccid: protocol. -ccid: This package is needed to communicate with the CCID smartcard readers -ccid: through the PC/SC Lite resource manager (pcscd). It also supports -ccid: the GemPC Twin via serial port, and the GemPC PCMCIA and PCI-Express -ccid: cards. -ccid: -ccid: More info at: https://github.com/LudovicRousseau/CCID diff --git a/system/cndrvcups-capt/cndrvcups-capt.SlackBuild b/system/cndrvcups-capt/cndrvcups-capt.SlackBuild index 74fe7eaad4..df5df4c9ff 100644 --- a/system/cndrvcups-capt/cndrvcups-capt.SlackBuild +++ b/system/cndrvcups-capt/cndrvcups-capt.SlackBuild @@ -81,7 +81,7 @@ find -L . \ # Fix missing include patch -p1 <$CWD/ppapdata.c.diff -SLKCFLAGS+=" -fcommon" +SLKCFLAGS+=" -fcommon -fpermissive" ( cd driver diff --git a/system/cndrvcups-common/cndrvcups-common.SlackBuild b/system/cndrvcups-common/cndrvcups-common.SlackBuild index 154cf6c0a9..7c8d7ed9e8 100644 --- a/system/cndrvcups-common/cndrvcups-common.SlackBuild +++ b/system/cndrvcups-common/cndrvcups-common.SlackBuild @@ -81,7 +81,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 {} \; -SLKCFLAGS+=" -fcommon" +SLKCFLAGS+=" -fcommon -fpermissive" ( cd buftool diff --git a/system/cnijfilter2/cnijfilter2.SlackBuild b/system/cnijfilter2/cnijfilter2.SlackBuild index c54efd21a1..193612fc03 100644 --- a/system/cnijfilter2/cnijfilter2.SlackBuild +++ b/system/cnijfilter2/cnijfilter2.SlackBuild @@ -30,13 +30,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cnijfilter2 -VERSION=${VERSION:-6.50.1} +VERSION=${VERSION:-6.80.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} SRCNAM=$PRGNAM-source -SRCVERSION=6.50-1 +SRCVERSION=6.80-1 if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -103,7 +103,10 @@ find -L . \ \( -type f \! -name autogen.sh \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/gcc10.patch +sed -e '/GET_PROTOCOL/ s:^int:extern &:g' -i 'lgmon3/src/cnijlgmon3.c' +patch -p1 < $CWD/patches/add-missing-import.patch +patch -p1 < $CWD/patches/fix-libxml2-config.patch +patch -p1 < $CWD/patches/gcc15-fix.patch for dir in cmdtocanonij2 cmdtocanonij3 ; do pushd $dir diff --git a/system/cnijfilter2/cnijfilter2.info b/system/cnijfilter2/cnijfilter2.info index f9d0ca98dd..a9da721f98 100644 --- a/system/cnijfilter2/cnijfilter2.info +++ b/system/cnijfilter2/cnijfilter2.info @@ -1,8 +1,8 @@ PRGNAM="cnijfilter2" -VERSION="6.50.1" +VERSION="6.80.1" HOMEPAGE="https://asia.canon/en/support/0101163901" -DOWNLOAD="https://gdlp01.c-wss.com/gds/9/0100011639/01/cnijfilter2-source-6.50-1.tar.gz" -MD5SUM="a1c4f44c64c97d0cfa58b93e6655ab2c" +DOWNLOAD="https://gdlp01.c-wss.com/gds/2/0100012302/02/cnijfilter2-source-6.80-1.tar.gz" +MD5SUM="98b5836e486c94a9214c79766bd532ff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/cnijfilter2/gcc10.patch b/system/cnijfilter2/gcc10.patch deleted file mode 100644 index 449a9777f1..0000000000 --- a/system/cnijfilter2/gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cnijfilter2-source-6.20-1.orig/lgmon3/src/cnijlgmon3.c 2021-02-20 22:08:56.000000000 +1300 -+++ cnijfilter2-source-6.20-1/lgmon3/src/cnijlgmon3.c 2021-11-05 23:35:18.626436603 +1300 -@@ -55,7 +55,7 @@ - int (*GET_STATUS)(char *, int, int *, int * , char *); - int (*GET_STATUS2)(char *, int, char *, int *, int * , char *, char *); - int (*GET_STATUS2_MAINTENANCE)(char *, int, char *, int *, int * , char *, char *); --int (*GET_PROTOCOL)(char *, size_t); -+static int (*GET_PROTOCOL)(char *, size_t); - - - int main(int argc, char *argv[]) diff --git a/system/cnijfilter2/patches/add-missing-import.patch b/system/cnijfilter2/patches/add-missing-import.patch new file mode 100644 index 0000000000..dfa5851a64 --- /dev/null +++ b/system/cnijfilter2/patches/add-missing-import.patch @@ -0,0 +1,11 @@ +diff -ura cnijfilter2-source-6.60-1/lgmon3/src/keytext.c cnijfilter2-source-6.60-1-new/lgmon3/src/keytext.c +--- cnijfilter2-source-6.60-1/lgmon3/src/keytext.c 2022-12-20 05:28:46.000000000 +0000 ++++ cnijfilter2-source-6.60-1-new/lgmon3/src/keytext.c 2024-07-23 20:35:24.859816250 +0100 +@@ -37,6 +37,7 @@ + #include + #include /* Ver.2.80 */ + #include ++#include + + #include "keytext.h" + diff --git a/system/cnijfilter2/patches/fix-libxml2-config.patch b/system/cnijfilter2/patches/fix-libxml2-config.patch new file mode 100644 index 0000000000..34f8e2ef4a --- /dev/null +++ b/system/cnijfilter2/patches/fix-libxml2-config.patch @@ -0,0 +1,24 @@ +diff -ura cnijfilter2-source-6.80-1/lgmon3/configure.in cnijfilter2-source-6.80-1.new/lgmon3/configure.in +--- cnijfilter2-source-6.80-1/lgmon3/configure.in 2024-09-20 07:28:40.000000000 +0100 ++++ cnijfilter2-source-6.80-1.new/lgmon3/configure.in 2025-02-24 01:21:57.676721707 +0000 +@@ -72,7 +72,7 @@ + + CFLAGS="-O2" + +-XML2_CFLAGS=`xml2-config --cflags` ++XML2_CFLAGS=`pkg-config libxml-2.0 --cflags` + AC_SUBST(XML2_CFLAGS) + + AC_OUTPUT([ +diff -ura cnijfilter2-source-6.80-1/tocnpwg/configure.in cnijfilter2-source-6.80-1.new/tocnpwg/configure.in +--- cnijfilter2-source-6.80-1/tocnpwg/configure.in 2024-09-20 07:28:40.000000000 +0100 ++++ cnijfilter2-source-6.80-1.new/tocnpwg/configure.in 2025-02-24 01:22:00.930699848 +0000 +@@ -41,7 +41,7 @@ + + CFLAGS="-O2" + +-XML_2_CFLAGS=`xml2-config --cflags` ++XML_2_CFLAGS=`pkg-config libxml-2.0 --cflags` + AC_SUBST(XML_2_CFLAGS) + + AC_OUTPUT(Makefile diff --git a/system/cnijfilter2/patches/gcc15-fix.patch b/system/cnijfilter2/patches/gcc15-fix.patch new file mode 100644 index 0000000000..5a53e82a7a --- /dev/null +++ b/system/cnijfilter2/patches/gcc15-fix.patch @@ -0,0 +1,14 @@ +diff -ura cnijfilter2-source-6.80-1/lgmon3/src/common/libcnnet2_type.h cnijfilter2-source-6.80-1-new/lgmon3/src/common/libcnnet2_type.h +--- cnijfilter2-source-6.80-1/lgmon3/src/common/libcnnet2_type.h 2024-09-20 07:28:40.000000000 +0100 ++++ cnijfilter2-source-6.80-1-new/lgmon3/src/common/libcnnet2_type.h 2025-05-03 00:16:31.991678319 +0100 +@@ -47,10 +47,6 @@ + CNNET2_SETTING_FLAG_DISCOVER_PACKET_WAIT_MILLIS, /*検索パケット複数送信時の待ち時間*/ + } CNNET2_SETTING_FLAGS; + +-#ifndef __cplusplus +-typedef char bool; +-#endif +- + typedef struct { + int nicIndex_; + char ipAddressStr_[46]; diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild index 4c668cebbe..7065e6a43c 100644 --- a/system/conky/conky.SlackBuild +++ b/system/conky/conky.SlackBuild @@ -104,7 +104,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DDOC_PATH=/usr/doc/$PRGNAM-$VERSION \ - -DMAINTAINER_MODE=ON \ + -DMAINTAINER_MODE=OFF \ -DBUILD_DOCS=OFF \ -DBUILD_EXTRAS=ON \ -DBUILD_XDBE=ON \ diff --git a/system/corectrl/corectrl.SlackBuild b/system/corectrl/corectrl.SlackBuild index 198120e66e..2687237fa4 100644 --- a/system/corectrl/corectrl.SlackBuild +++ b/system/corectrl/corectrl.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=corectrl -VERSION=${VERSION:-v1.3.2} +VERSION=${VERSION:-v1.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/corectrl/corectrl.info b/system/corectrl/corectrl.info index 681b3e7e29..694678328d 100644 --- a/system/corectrl/corectrl.info +++ b/system/corectrl/corectrl.info @@ -1,10 +1,10 @@ PRGNAM="corectrl" -VERSION="v1.3.2" +VERSION="v1.5.1" HOMEPAGE="https://gitlab.com/corectrl/corectrl/" -DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.3.2/corectrl-v1.3.2.tar.gz" -MD5SUM="656d7d307c7f0185794d08239bf00d58" +DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.5.1/corectrl-v1.5.1.tar.gz" +MD5SUM="2648caf71b21625c913eb37f51bda022" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="Botan" +REQUIRES="Botan pugixml spdlog" MAINTAINER="Matthew Miller" EMAIL="mattallmill@gmail.com" diff --git a/system/corectrl/corectrl.patch b/system/corectrl/corectrl.patch index bd92a1e54f..bd1c3cb584 100644 --- a/system/corectrl/corectrl.patch +++ b/system/corectrl/corectrl.patch @@ -1,11 +1,12 @@ ---- corectrl-v1.3.0/resources/launcher.desktop 2022-09-18 12:56:52.000000000 -0500 -+++ corectrl-v1.3.0/resources/launcher.desktop.new 2022-10-04 15:05:55.822235127 -0500 +diff -Naur corectrl-v1.5.1.orig/resources/launcher.desktop corectrl-v1.5.1/resources/launcher.desktop +--- corectrl-v1.5.1.orig/resources/launcher.desktop 2025-04-29 11:52:46.000000000 +0200 ++++ corectrl-v1.5.1/resources/launcher.desktop 2025-08-16 14:55:23.437947000 +0200 @@ -8,7 +8,7 @@ StartupWMClass=corectrl Terminal=false Type=Application -Categories=System;Settings;Utility; +Categories=System; - Keywords=core;control;system;hardware; + Keywords=control;system;hardware;frequency;fan;voltage;overclock;underclock;gpu;cpu; # Translations diff --git a/system/cowsql/conflicting-types.patch b/system/cowsql/conflicting-types.patch new file mode 100644 index 0000000000..29e8a1c239 --- /dev/null +++ b/system/cowsql/conflicting-types.patch @@ -0,0 +1,54 @@ +https://github.com/cowsql/cowsql/pull/37 +From: Brahmajit Das +Date: Sat, 14 Jun 2025 00:18:38 +0530 +Subject: [PATCH] src/lib/serialize.h: don't define double as float_t + +libuv with commit 85b526f makes uv.h include math.h for the definitions +of NAN/INFINITY. That header also defines the ISO C standard float_t +type. Now that that definition is in scope, the cowsql definition in +src/lib/serialize.h conflicts with it. + +Fixes: 451cff63b29366237a9502823299b05bbff8662b +Closes: https://github.com/cowsql/cowsql/issues/35 +Signed-off-by: Brahmajit Das +--- a/src/lib/serialize.h ++++ b/src/lib/serialize.h +@@ -37,7 +37,7 @@ static_assert(sizeof(double) == sizeof(uint64_t), + * Basic type aliases to used by macro-based processing. + */ + typedef const char *text_t; +-typedef double float_t; ++typedef double cowsql_float; + typedef uv_buf_t blob_t; + + /** +@@ -143,7 +143,7 @@ COWSQL_INLINE size_t int64__sizeof(const int64_t *value) + return sizeof(int64_t); + } + +-COWSQL_INLINE size_t float__sizeof(const float_t *value) ++COWSQL_INLINE size_t float__sizeof(const cowsql_float *value) + { + (void)value; + return sizeof(double); +@@ -190,7 +190,7 @@ COWSQL_INLINE void int64__encode(const int64_t *value, void **cursor) + *cursor += sizeof(int64_t); + } + +-COWSQL_INLINE void float__encode(const float_t *value, void **cursor) ++COWSQL_INLINE void float__encode(const cowsql_float *value, void **cursor) + { + *(uint64_t *)(*cursor) = ByteFlipLe64(*(uint64_t *)value); + *cursor += sizeof(uint64_t); +@@ -273,7 +273,7 @@ COWSQL_INLINE int int64__decode(struct cursor *cursor, int64_t *value) + return 0; + } + +-COWSQL_INLINE int float__decode(struct cursor *cursor, float_t *value) ++COWSQL_INLINE int float__decode(struct cursor *cursor, cowsql_float *value) + { + size_t n = sizeof(double); + if (n > cursor->cap) { +-- +2.49.0 + diff --git a/system/cowsql/cowsql.SlackBuild b/system/cowsql/cowsql.SlackBuild index b65a5dba14..97d61abb52 100644 --- a/system/cowsql/cowsql.SlackBuild +++ b/system/cowsql/cowsql.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cowsql VERSION=${VERSION:-1.15.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -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 {} \; +# 20250614 KEC: libuv compatibility (via Gentoo) +patch -p1 < $CWD/conflicting-types.patch + autoreconf -i CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/d-feet/d-feet.SlackBuild b/system/d-feet/d-feet.SlackBuild index c2fe7e4e0a..6208c3e405 100644 --- a/system/d-feet/d-feet.SlackBuild +++ b/system/d-feet/d-feet.SlackBuild @@ -73,6 +73,10 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION + +# Make data/meson.build work with a newer version of meson +patch -p1 < $CWD/data_meson_build.patch + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/system/d-feet/data_meson_build.patch b/system/d-feet/data_meson_build.patch new file mode 100644 index 0000000000..b3fa8c8409 --- /dev/null +++ b/system/d-feet/data_meson_build.patch @@ -0,0 +1,20 @@ +diff --git a/data/meson.build b/data/meson.build +index 026bd80..3b03b94 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -13,7 +13,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: '@BASENAME@', +@@ -25,7 +24,6 @@ i18n.merge_file( + appdata = df_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: '@BASENAME@', + po_dir: po_dir, diff --git a/system/detox/detox.SlackBuild b/system/detox/detox.SlackBuild index f8a3f57be8..117f1c36e2 100644 --- a/system/detox/detox.SlackBuild +++ b/system/detox/detox.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=detox -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -103,7 +103,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/detox/detox.info b/system/detox/detox.info index 2451d0f5e2..14df8cca07 100644 --- a/system/detox/detox.info +++ b/system/detox/detox.info @@ -1,8 +1,8 @@ PRGNAM="detox" -VERSION="1.2.0" +VERSION="2.0.0" HOMEPAGE="http://detox.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/detox/detox-1.2.0.tar.bz2" -MD5SUM="da34c6bc3c68ce2fb008e25066e72927" +DOWNLOAD="http://downloads.sourceforge.net/detox/detox-2.0.0.tar.bz2" +MD5SUM="62c07049b66dae30231864d019ebc645" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/encfs/encfs.SlackBuild b/system/encfs/encfs.SlackBuild index d6dff42a4b..b4ed1385da 100644 --- a/system/encfs/encfs.SlackBuild +++ b/system/encfs/encfs.SlackBuild @@ -89,6 +89,7 @@ cd build -DCMAKE_BUILD_TYPE=Release \ -DUSE_INTERNAL_TINYXML=OFF \ -DINSTALL_LIBENCFS=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DBUILD_SHARED_LIBS=ON \ .. make diff --git a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild index 8f179cca53..f161d17941 100644 --- a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild +++ b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild @@ -82,7 +82,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-implicit-function-declaration" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild index 985db83c11..d8ac606476 100644 --- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild +++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild @@ -109,7 +109,7 @@ if [ x`objdump -f escprlib/lib/libescpr2_32.a |grep ^architecture |cut -d' ' -f- fi #next line added as slackware autocmake is higher than 1.15 so m4 files need regenerating for v>1.2.12 autoreconf -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/evhz/evhz.SlackBuild b/system/evhz/evhz.SlackBuild index d05355f8f9..0d34ea1aaf 100644 --- a/system/evhz/evhz.SlackBuild +++ b/system/evhz/evhz.SlackBuild @@ -79,6 +79,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/gcc15.patch + cc -o evhz evhz.c install -D -m755 evhz $PKG/usr/bin/evhz diff --git a/system/evhz/gcc15.patch b/system/evhz/gcc15.patch new file mode 100644 index 0000000000..cdcf99c7fd --- /dev/null +++ b/system/evhz/gcc15.patch @@ -0,0 +1,13 @@ +diff --git a/evhz.c b/evhz.c +index 950f727..3f2f935 100644 +--- a/evhz.c ++++ b/evhz.c +@@ -39,7 +39,7 @@ typedef struct event_s { + + int quit = 0; + +-void sigint() { ++void sigint(int signum) { + quit = 1; + } + diff --git a/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch b/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch deleted file mode 100644 index 31c2dd7843..0000000000 --- a/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch +++ /dev/null @@ -1,469 +0,0 @@ -From 534e6d555736b97211523970d378dfb0db2608e9 Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -Date: Mon, 22 Feb 2021 21:44:07 -0800 -Subject: [PATCH 1/6] tmpnam.c: fix heap overflow - -Signed-off-by: Ilya Lipnitskiy ---- - src/tmpnam.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tmpnam.c b/src/tmpnam.c -index ce60817..917ee6b 100644 ---- a/src/tmpnam.c -+++ b/src/tmpnam.c -@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s)) - - expand_chroot_path(ptr); - -- ptr2 = malloc(strlen(ptr)); -+ ptr2 = malloc(strlen(ptr) + 1); - if (ptr2 == NULL) return NULL; - - strcpy(ptr2, ptr); - -From 75d7e6fa191c11a791faff06a0de86eaa7801d05 Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -Date: Mon, 22 Feb 2021 21:46:36 -0800 -Subject: [PATCH 2/6] declare missing bufs, remove ver from lstat - -Signed-off-by: Ilya Lipnitskiy ---- - src/lstat.c | 8 +++++--- - src/lstat.h | 2 +- - src/mknod.c | 2 ++ - src/stat.c | 2 ++ - src/stat64.c | 2 ++ - 5 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/src/lstat.c b/src/lstat.c -index 3f6d819..54e3263 100644 ---- a/src/lstat.c -+++ b/src/lstat.c -@@ -28,9 +28,11 @@ - #include "lstat.h" - - --wrapper(lstat, int, (int ver, const char * filename, struct stat * buf)) -+wrapper(lstat, int, (const char * filename, struct stat * buf)) - { -- debug("lstat(%d, \"%s\", &buf)", ver, filename); -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; -+ debug("lstat(\"%s\", &buf)", filename); - - if (!fakechroot_localdir(filename)) { - if (filename != NULL) { -@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf)) - } - } - -- return lstat_rel(ver, filename, buf); -+ return lstat_rel(filename, buf); - } - - -diff --git a/src/lstat.h b/src/lstat.h -index 751c1ea..ee48303 100644 ---- a/src/lstat.h -+++ b/src/lstat.h -@@ -26,7 +26,7 @@ - - #ifndef HAVE___LXSTAT - --wrapper_proto(lstat, int, (int, const char *, struct stat *)); -+wrapper_proto(lstat, int, (const char *, struct stat *)); - - int lstat_rel(const char *, struct stat *); - -diff --git a/src/mknod.c b/src/mknod.c -index 52fd33b..2771037 100644 ---- a/src/mknod.c -+++ b/src/mknod.c -@@ -28,6 +28,8 @@ - - wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev)) - { -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; - debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev); - expand_chroot_path(pathname); - return nextcall(mknod)(pathname, mode, dev); -diff --git a/src/stat.c b/src/stat.c -index 7845662..7b37793 100644 ---- a/src/stat.c -+++ b/src/stat.c -@@ -33,6 +33,8 @@ - - wrapper(stat, int, (const char * file_name, struct stat * buf)) - { -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; - debug("stat(\"%s\", &buf)", file_name); - expand_chroot_path(file_name); - return nextcall(stat)(file_name, buf); -diff --git a/src/stat64.c b/src/stat64.c -index aac9c75..a360f66 100644 ---- a/src/stat64.c -+++ b/src/stat64.c -@@ -34,6 +34,8 @@ - - wrapper(stat64, int, (const char * file_name, struct stat64 * buf)) - { -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; - debug("stat64(\"%s\", &buf)", file_name); - expand_chroot_path(file_name); - return nextcall(stat64)(file_name, buf); - -From 693a3597ea7fccfb62f357503ff177bd3e3d5a89 Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -Date: Mon, 22 Feb 2021 21:47:09 -0800 -Subject: [PATCH 3/6] fix glibc 2.33+ compatibility - -Signed-off-by: Ilya Lipnitskiy ---- - configure.ac | 20 ++++++++++++++++++++ - src/ftw.c | 2 +- - src/ftw64.c | 14 +++++++++++--- - src/libfakechroot.h | 15 +++++++++++++++ - src/lstat.c | 2 +- - src/lstat.h | 2 +- - src/lstat64.c | 2 +- - src/mknod.c | 2 +- - src/mknodat.c | 2 +- - src/stat.c | 2 +- - src/stat64.c | 2 +- - 11 files changed, 54 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f8cdb32..9cc2e77 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY - # Checks for libraries. - AC_CHECK_LIB([dl], [dlsym]) - -+AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33]) -+AC_MSG_CHECKING([for glibc 2.33+]) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+ #include -+ ]], [[ -+#ifdef __GLIBC__ -+#if !__GLIBC_PREREQ(2,33) -+#error glibc<2.33 -+#endif -+#else -+#error not glibc -+#endif -+ ]])],[ -+ AC_DEFINE(NEW_GLIBC,1) -+ AC_MSG_RESULT([yes]) -+ ],[ -+ AC_DEFINE(NEW_GLIBC,0) -+ AC_MSG_RESULT([no]) -+ ]) -+ - # Checks for header files. - AC_HEADER_DIRENT - AC_HEADER_STDC -diff --git a/src/ftw.c b/src/ftw.c -index 92fc126..a9abc85 100644 ---- a/src/ftw.c -+++ b/src/ftw.c -@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *); - # define NFTW_NEW_NAME __new_nftw - # define INO_T ino_t - # define STAT stat --# ifdef _LIBC -+# if defined(_LIBC) && !NEW_GLIBC - # define LXSTAT __lxstat - # define XSTAT __xstat - # define FXSTATAT __fxstatat -diff --git a/src/ftw64.c b/src/ftw64.c -index 7cc8cdf..cee1f2b 100644 ---- a/src/ftw64.c -+++ b/src/ftw64.c -@@ -18,6 +18,8 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#include "config.h" -+ - #define __FTW64_C - #define FTW_NAME ftw64 - #define NFTW_NAME nftw64 -@@ -25,9 +27,15 @@ - #define NFTW_NEW_NAME __new_nftw64 - #define INO_T ino64_t - #define STAT stat64 --#define LXSTAT __lxstat64 --#define XSTAT __xstat64 --#define FXSTATAT __fxstatat64 -+#if NEW_GLIBC -+# define LXSTAT(V,f,sb) lstat64 (f,sb) -+# define XSTAT(V,f,sb) stat64 (f,sb) -+# define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m) -+#else -+# define LXSTAT __lxstat64 -+# define XSTAT __xstat64 -+# define FXSTATAT __fxstatat64 -+#endif - #define FTW_FUNC_T __ftw64_func_t - #define NFTW_FUNC_T __nftw64_func_t - -diff --git a/src/libfakechroot.h b/src/libfakechroot.h -index 4cf199f..64ff15f 100644 ---- a/src/libfakechroot.h -+++ b/src/libfakechroot.h -@@ -200,6 +200,21 @@ - # endif - #endif - -+#ifndef _STAT_VER -+ #if defined (__aarch64__) -+ #define _STAT_VER 0 -+ #elif defined (__powerpc__) && __WORDSIZE == 64 -+ #define _STAT_VER 1 -+ #elif defined (__riscv) && __riscv_xlen==64 -+ #define _STAT_VER 0 -+ #elif defined (__s390x__) -+ #define _STAT_VER 1 -+ #elif defined (__x86_64__) -+ #define _STAT_VER 1 -+ #else -+ #define _STAT_VER 3 -+ #endif -+#endif - - typedef void (*fakechroot_wrapperfn_t)(void); - -diff --git a/src/lstat.c b/src/lstat.c -index 54e3263..fa38323 100644 ---- a/src/lstat.c -+++ b/src/lstat.c -@@ -20,7 +20,7 @@ - - #include - --#ifndef HAVE___LXSTAT -+#if !defined(HAVE___LXSTAT) || NEW_GLIBC - - #include - #include -diff --git a/src/lstat.h b/src/lstat.h -index ee48303..c46a2b9 100644 ---- a/src/lstat.h -+++ b/src/lstat.h -@@ -24,7 +24,7 @@ - #include - #include "libfakechroot.h" - --#ifndef HAVE___LXSTAT -+#if !defined(HAVE___LXSTAT) || NEW_GLIBC - - wrapper_proto(lstat, int, (const char *, struct stat *)); - -diff --git a/src/lstat64.c b/src/lstat64.c -index b6212fc..a332d7c 100644 ---- a/src/lstat64.c -+++ b/src/lstat64.c -@@ -20,7 +20,7 @@ - - #include - --#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64) -+#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC) - - #define _LARGEFILE64_SOURCE - #define _BSD_SOURCE -diff --git a/src/mknod.c b/src/mknod.c -index 2771037..aeb750b 100644 ---- a/src/mknod.c -+++ b/src/mknod.c -@@ -20,7 +20,7 @@ - - #include - --#ifndef HAVE___XMKNOD -+#if !defined(HAVE___XMKNOD) || NEW_GLIBC - - #include - #include "libfakechroot.h" -diff --git a/src/mknodat.c b/src/mknodat.c -index 732a22b..3239b35 100644 ---- a/src/mknodat.c -+++ b/src/mknodat.c -@@ -20,7 +20,7 @@ - - #include - --#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT) -+#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC) - - #define _ATFILE_SOURCE - #include -diff --git a/src/stat.c b/src/stat.c -index 7b37793..5ef57ba 100644 ---- a/src/stat.c -+++ b/src/stat.c -@@ -20,7 +20,7 @@ - - #include - --#ifndef HAVE___XSTAT -+#if !defined(HAVE___XSTAT) || NEW_GLIBC - - #define _BSD_SOURCE - #define _DEFAULT_SOURCE -diff --git a/src/stat64.c b/src/stat64.c -index a360f66..993ce80 100644 ---- a/src/stat64.c -+++ b/src/stat64.c -@@ -20,7 +20,7 @@ - - #include - --#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64) -+#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC) - - #define _BSD_SOURCE - #define _LARGEFILE64_SOURCE - -From e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5 Mon Sep 17 00:00:00 2001 -From: neok-m4700 -Date: Wed, 24 Feb 2021 17:36:57 +0100 -Subject: [PATCH 6/6] wrap fstatat and fstatat64 - ---- - configure.ac | 2 ++ - src/Makefile.am | 2 ++ - src/fstatat.c | 42 ++++++++++++++++++++++++++++++++++++++++++ - src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 89 insertions(+) - create mode 100644 src/fstatat.c - create mode 100644 src/fstatat64.c - -diff --git a/configure.ac b/configure.ac -index 9cc2e77..5b3053e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -218,6 +218,8 @@ AC_CHECK_FUNCS(m4_normalize([ - freopen64 - fstat - fstat64 -+ fstatat -+ fstatat64 - fts_children - fts_open - fts_read -diff --git a/src/Makefile.am b/src/Makefile.am -index 6066345..eb311c0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \ - fopen64.c \ - freopen.c \ - freopen64.c \ -+ fstatat.c \ -+ fstatat64.c \ - fts.c \ - fts64.c \ - ftw.c \ -diff --git a/src/fstatat.c b/src/fstatat.c -new file mode 100644 -index 0000000..ca7578b ---- /dev/null -+++ b/src/fstatat.c -@@ -0,0 +1,42 @@ -+/* -+ libfakechroot -- fake chroot environment -+ Copyright (c) 2010, 2021 Piotr Roszatycki -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+*/ -+ -+ -+#include -+ -+#ifdef HAVE_FSTATAT -+ -+#define _ATFILE_SOURCE -+#define _POSIX_C_SOURCE 200809L -+#include -+#include -+#include "libfakechroot.h" -+ -+wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags)) -+{ -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; -+ debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); -+ expand_chroot_path_at(dirfd, pathname); -+ return nextcall(fstatat)(dirfd, pathname, buf, flags); -+} -+ -+#else -+typedef int empty_translation_unit; -+#endif -diff --git a/src/fstatat64.c b/src/fstatat64.c -new file mode 100644 -index 0000000..1863372 ---- /dev/null -+++ b/src/fstatat64.c -@@ -0,0 +1,43 @@ -+/* -+ libfakechroot -- fake chroot environment -+ Copyright (c) 2010, 2021 Piotr Roszatycki -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+*/ -+ -+ -+#include -+ -+#ifdef HAVE_FSTATAT64 -+ -+#define _ATFILE_SOURCE -+#define _POSIX_C_SOURCE 200809L -+#define _LARGEFILE64_SOURCE -+#include -+#include -+#include "libfakechroot.h" -+ -+wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags)) -+{ -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; -+ debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); -+ expand_chroot_path_at(dirfd, pathname); -+ return nextcall(fstatat64)(dirfd, pathname, buf, flags); -+} -+ -+#else -+typedef int empty_translation_unit; -+#endif diff --git a/system/fakechroot/fakechroot.SlackBuild b/system/fakechroot/fakechroot.SlackBuild index ae5854880a..db97a1ba6c 100644 --- a/system/fakechroot/fakechroot.SlackBuild +++ b/system/fakechroot/fakechroot.SlackBuild @@ -72,8 +72,6 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -# thanks gentoo maintainers -patch -p1 < $CWD/fakechroot-2.20.1-glibc-2.33.patch chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -81,6 +79,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 {} \; +# get patches from fedora (thanks!) +for i in $CWD/patches/* ; do patch -p1 < $i ; done +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/fakechroot/patches/104.patch b/system/fakechroot/patches/104.patch new file mode 100644 index 0000000000..0e7d7f0b52 --- /dev/null +++ b/system/fakechroot/patches/104.patch @@ -0,0 +1,1727 @@ +From 11589e1037372c5ad719e1e46d7462fd196caa56 Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues +Date: Thu, 24 Jun 2021 10:38:28 +0200 +Subject: [PATCH 01/11] src/lckpwdf.c: create an empty /etc/.pwd.lock + +--- + src/lckpwdf.c | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +diff --git a/src/lckpwdf.c b/src/lckpwdf.c +index dc0e68b5..66a058de 100644 +--- a/src/lckpwdf.c ++++ b/src/lckpwdf.c +@@ -22,12 +22,37 @@ + + #ifdef HAVE_LCKPWDF + ++#include ++#include + #include "libfakechroot.h" ++#include "open.h" + + + wrapper(lckpwdf, int, (void)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ ++ int file; + debug("lckpwdf()"); ++ // lckpwdf will create an empty /etc/.pwd.lock ++ // if that file doesn't exist yet, we create it here as well ++ char* pwdlockfile = "/etc/.pwd.lock"; ++ expand_chroot_path(pwdlockfile); ++ ++ if ((file = nextcall(open)(pwdlockfile, O_RDONLY)) == 0) { ++ // if the file already exists, don't touch it ++ close(file); ++ return 0; ++ } ++ ++ if ((file = nextcall(open)(pwdlockfile, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) == -1) { ++ // we ignore any errors (maybe /etc doesn't exist or we don't have the ++ // necessary permissions) ++ return 0; ++ } ++ // the file remains empty ++ close(file); + return 0; + } + + +From 3cdb9b5426ef508c9220b4b0316954e3b7dff9ac Mon Sep 17 00:00:00 2001 +From: Hajime Yoshimori +Date: Fri, 1 May 2020 21:14:32 +0900 +Subject: [PATCH 02/11] check return value of dladdr + +https://github.com/dex4er/fakechroot/pull/70 +--- + src/dladdr.c | 12 +++++++----- + test/Makefile.am | 1 + + test/src/Makefile.am | 1 + + test/src/test-dladdr.c | 14 ++++++++++++++ + test/t/dladdr.t | 14 ++++++++++++++ + 5 files changed, 37 insertions(+), 5 deletions(-) + create mode 100644 test/src/test-dladdr.c + create mode 100755 test/t/dladdr.t + +diff --git a/src/dladdr.c b/src/dladdr.c +index fef32579..3dffdb3f 100644 +--- a/src/dladdr.c ++++ b/src/dladdr.c +@@ -36,11 +36,13 @@ wrapper(dladdr, int, (const void * addr, Dl_info * info)) + + ret = nextcall(dladdr)(addr, info); + +- if (info->dli_fname) { +- narrow_chroot_path(info->dli_fname); +- } +- if (info->dli_sname) { +- narrow_chroot_path(info->dli_sname); ++ if (ret != 0) { ++ if (info->dli_fname) { ++ narrow_chroot_path(info->dli_fname); ++ } ++ if (info->dli_sname) { ++ narrow_chroot_path(info->dli_sname); ++ } + } + + return ret; +diff --git a/test/Makefile.am b/test/Makefile.am +index aba29538..0021b0a1 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -9,6 +9,7 @@ TESTS = \ + t/cmd-subst.t \ + t/cp.t \ + t/dedotdot.t \ ++ t/dladdr.t \ + t/execlp.t \ + t/execve-elfloader.t \ + t/execve-null-envp.t \ +diff --git a/test/src/Makefile.am b/test/src/Makefile.am +index 7fb3075b..5f5fde8d 100644 +--- a/test/src/Makefile.am ++++ b/test/src/Makefile.am +@@ -3,6 +3,7 @@ check_PROGRAMS = \ + test-chroot \ + test-clearenv \ + test-dedotdot \ ++ test-dladdr \ + test-execlp \ + test-execve-null-envp \ + test-fts \ +diff --git a/test/src/test-dladdr.c b/test/src/test-dladdr.c +new file mode 100644 +index 00000000..5ec8d248 +--- /dev/null ++++ b/test/src/test-dladdr.c +@@ -0,0 +1,14 @@ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++ ++int main(int argc, char** argv) ++{ ++ Dl_info info; ++ memset(&info, 0xfe, sizeof(info)); /* fill with inaccessible address */ ++ int ret = dladdr(NULL, &info); ++ printf("%ld\n", ret); ++ return 0; ++} +diff --git a/test/t/dladdr.t b/test/t/dladdr.t +new file mode 100755 +index 00000000..fc7f9397 +--- /dev/null ++++ b/test/t/dladdr.t +@@ -0,0 +1,14 @@ ++#!/bin/sh ++ ++srcdir=${srcdir:-.} ++. $srcdir/common.inc.sh ++ ++prepare 1 ++ ++PATH=$srcdir/bin:$PATH ++ ++t=`$srcdir/fakechroot.sh $testtree /bin/test-dladdr` ++[ "$t" != "0" ] && not ++ok "dladdr returns" $t ++ ++cleanup + +From 63c2cbed6dca6196940b439736ca2c069cb9358b Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Mon, 22 Feb 2021 21:44:07 -0800 +Subject: [PATCH 03/11] tmpnam.c: fix heap overflow + +https://github.com/dex4er/fakechroot/pull/85 + +Signed-off-by: Ilya Lipnitskiy +--- + src/tmpnam.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tmpnam.c b/src/tmpnam.c +index ce60817a..917ee6b7 100644 +--- a/src/tmpnam.c ++++ b/src/tmpnam.c +@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s)) + + expand_chroot_path(ptr); + +- ptr2 = malloc(strlen(ptr)); ++ ptr2 = malloc(strlen(ptr) + 1); + if (ptr2 == NULL) return NULL; + + strcpy(ptr2, ptr); + +From be3a291ef37ace606ec2845f6c1b645b981805cb Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Mon, 22 Feb 2021 21:46:36 -0800 +Subject: [PATCH 04/11] declare missing bufs, remove ver from lstat + +https://github.com/dex4er/fakechroot/pull/85 + +Signed-off-by: Ilya Lipnitskiy +--- + src/lstat.c | 8 +++++--- + src/lstat.h | 2 +- + src/mknod.c | 2 ++ + src/stat.c | 2 ++ + src/stat64.c | 2 ++ + 5 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/src/lstat.c b/src/lstat.c +index 3f6d819f..54e3263f 100644 +--- a/src/lstat.c ++++ b/src/lstat.c +@@ -28,9 +28,11 @@ + #include "lstat.h" + + +-wrapper(lstat, int, (int ver, const char * filename, struct stat * buf)) ++wrapper(lstat, int, (const char * filename, struct stat * buf)) + { +- debug("lstat(%d, \"%s\", &buf)", ver, filename); ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("lstat(\"%s\", &buf)", filename); + + if (!fakechroot_localdir(filename)) { + if (filename != NULL) { +@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf)) + } + } + +- return lstat_rel(ver, filename, buf); ++ return lstat_rel(filename, buf); + } + + +diff --git a/src/lstat.h b/src/lstat.h +index 751c1ead..ee483033 100644 +--- a/src/lstat.h ++++ b/src/lstat.h +@@ -26,7 +26,7 @@ + + #ifndef HAVE___LXSTAT + +-wrapper_proto(lstat, int, (int, const char *, struct stat *)); ++wrapper_proto(lstat, int, (const char *, struct stat *)); + + int lstat_rel(const char *, struct stat *); + +diff --git a/src/mknod.c b/src/mknod.c +index 52fd33b2..27710372 100644 +--- a/src/mknod.c ++++ b/src/mknod.c +@@ -28,6 +28,8 @@ + + wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; + debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev); + expand_chroot_path(pathname); + return nextcall(mknod)(pathname, mode, dev); +diff --git a/src/stat.c b/src/stat.c +index 78456620..7b377933 100644 +--- a/src/stat.c ++++ b/src/stat.c +@@ -33,6 +33,8 @@ + + wrapper(stat, int, (const char * file_name, struct stat * buf)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; + debug("stat(\"%s\", &buf)", file_name); + expand_chroot_path(file_name); + return nextcall(stat)(file_name, buf); +diff --git a/src/stat64.c b/src/stat64.c +index aac9c75f..a360f66f 100644 +--- a/src/stat64.c ++++ b/src/stat64.c +@@ -34,6 +34,8 @@ + + wrapper(stat64, int, (const char * file_name, struct stat64 * buf)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; + debug("stat64(\"%s\", &buf)", file_name); + expand_chroot_path(file_name); + return nextcall(stat64)(file_name, buf); + +From 26f69c2c3120b9b059209c7566850ef5187de56a Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Mon, 22 Feb 2021 21:47:09 -0800 +Subject: [PATCH 05/11] fix glibc 2.33+ compatibility + +https://github.com/dex4er/fakechroot/pull/85 + +Signed-off-by: Ilya Lipnitskiy +--- + configure.ac | 20 ++++++++++++++++++++ + src/ftw.c | 2 +- + src/ftw64.c | 14 +++++++++++--- + src/libfakechroot.h | 15 +++++++++++++++ + src/lstat.c | 2 +- + src/lstat.h | 2 +- + src/lstat64.c | 2 +- + src/mknod.c | 2 +- + src/mknodat.c | 2 +- + src/stat.c | 2 +- + src/stat64.c | 2 +- + 11 files changed, 54 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f8cdb323..9cc2e779 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY + # Checks for libraries. + AC_CHECK_LIB([dl], [dlsym]) + ++AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33]) ++AC_MSG_CHECKING([for glibc 2.33+]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ #include ++ ]], [[ ++#ifdef __GLIBC__ ++#if !__GLIBC_PREREQ(2,33) ++#error glibc<2.33 ++#endif ++#else ++#error not glibc ++#endif ++ ]])],[ ++ AC_DEFINE(NEW_GLIBC,1) ++ AC_MSG_RESULT([yes]) ++ ],[ ++ AC_DEFINE(NEW_GLIBC,0) ++ AC_MSG_RESULT([no]) ++ ]) ++ + # Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +diff --git a/src/ftw.c b/src/ftw.c +index 92fc126c..a9abc853 100644 +--- a/src/ftw.c ++++ b/src/ftw.c +@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *); + # define NFTW_NEW_NAME __new_nftw + # define INO_T ino_t + # define STAT stat +-# ifdef _LIBC ++# if defined(_LIBC) && !NEW_GLIBC + # define LXSTAT __lxstat + # define XSTAT __xstat + # define FXSTATAT __fxstatat +diff --git a/src/ftw64.c b/src/ftw64.c +index 7cc8cdfd..cee1f2bc 100644 +--- a/src/ftw64.c ++++ b/src/ftw64.c +@@ -18,6 +18,8 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#include "config.h" ++ + #define __FTW64_C + #define FTW_NAME ftw64 + #define NFTW_NAME nftw64 +@@ -25,9 +27,15 @@ + #define NFTW_NEW_NAME __new_nftw64 + #define INO_T ino64_t + #define STAT stat64 +-#define LXSTAT __lxstat64 +-#define XSTAT __xstat64 +-#define FXSTATAT __fxstatat64 ++#if NEW_GLIBC ++# define LXSTAT(V,f,sb) lstat64 (f,sb) ++# define XSTAT(V,f,sb) stat64 (f,sb) ++# define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m) ++#else ++# define LXSTAT __lxstat64 ++# define XSTAT __xstat64 ++# define FXSTATAT __fxstatat64 ++#endif + #define FTW_FUNC_T __ftw64_func_t + #define NFTW_FUNC_T __nftw64_func_t + +diff --git a/src/libfakechroot.h b/src/libfakechroot.h +index 4cf199ff..64ff15fb 100644 +--- a/src/libfakechroot.h ++++ b/src/libfakechroot.h +@@ -200,6 +200,21 @@ + # endif + #endif + ++#ifndef _STAT_VER ++ #if defined (__aarch64__) ++ #define _STAT_VER 0 ++ #elif defined (__powerpc__) && __WORDSIZE == 64 ++ #define _STAT_VER 1 ++ #elif defined (__riscv) && __riscv_xlen==64 ++ #define _STAT_VER 0 ++ #elif defined (__s390x__) ++ #define _STAT_VER 1 ++ #elif defined (__x86_64__) ++ #define _STAT_VER 1 ++ #else ++ #define _STAT_VER 3 ++ #endif ++#endif + + typedef void (*fakechroot_wrapperfn_t)(void); + +diff --git a/src/lstat.c b/src/lstat.c +index 54e3263f..fa383234 100644 +--- a/src/lstat.c ++++ b/src/lstat.c +@@ -20,7 +20,7 @@ + + #include + +-#ifndef HAVE___LXSTAT ++#if !defined(HAVE___LXSTAT) || NEW_GLIBC + + #include + #include +diff --git a/src/lstat.h b/src/lstat.h +index ee483033..c46a2b9b 100644 +--- a/src/lstat.h ++++ b/src/lstat.h +@@ -24,7 +24,7 @@ + #include + #include "libfakechroot.h" + +-#ifndef HAVE___LXSTAT ++#if !defined(HAVE___LXSTAT) || NEW_GLIBC + + wrapper_proto(lstat, int, (const char *, struct stat *)); + +diff --git a/src/lstat64.c b/src/lstat64.c +index b6212fc8..a332d7c3 100644 +--- a/src/lstat64.c ++++ b/src/lstat64.c +@@ -20,7 +20,7 @@ + + #include + +-#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64) ++#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC) + + #define _LARGEFILE64_SOURCE + #define _BSD_SOURCE +diff --git a/src/mknod.c b/src/mknod.c +index 27710372..aeb750b0 100644 +--- a/src/mknod.c ++++ b/src/mknod.c +@@ -20,7 +20,7 @@ + + #include + +-#ifndef HAVE___XMKNOD ++#if !defined(HAVE___XMKNOD) || NEW_GLIBC + + #include + #include "libfakechroot.h" +diff --git a/src/mknodat.c b/src/mknodat.c +index 732a22bc..3239b357 100644 +--- a/src/mknodat.c ++++ b/src/mknodat.c +@@ -20,7 +20,7 @@ + + #include + +-#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT) ++#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC) + + #define _ATFILE_SOURCE + #include +diff --git a/src/stat.c b/src/stat.c +index 7b377933..5ef57bab 100644 +--- a/src/stat.c ++++ b/src/stat.c +@@ -20,7 +20,7 @@ + + #include + +-#ifndef HAVE___XSTAT ++#if !defined(HAVE___XSTAT) || NEW_GLIBC + + #define _BSD_SOURCE + #define _DEFAULT_SOURCE +diff --git a/src/stat64.c b/src/stat64.c +index a360f66f..993ce808 100644 +--- a/src/stat64.c ++++ b/src/stat64.c +@@ -20,7 +20,7 @@ + + #include + +-#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64) ++#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC) + + #define _BSD_SOURCE + #define _LARGEFILE64_SOURCE + +From 5366e9a366b213b879abf0f0a3aeb3409d3b57ed Mon Sep 17 00:00:00 2001 +From: neok-m4700 +Date: Wed, 24 Feb 2021 17:36:57 +0100 +Subject: [PATCH 06/11] wrap fstatat and fstatat64 + +https://github.com/dex4er/fakechroot/pull/86 +--- + configure.ac | 2 ++ + src/Makefile.am | 2 ++ + src/fstatat.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 89 insertions(+) + create mode 100644 src/fstatat.c + create mode 100644 src/fstatat64.c + +diff --git a/configure.ac b/configure.ac +index 9cc2e779..5b3053e1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -218,6 +218,8 @@ AC_CHECK_FUNCS(m4_normalize([ + freopen64 + fstat + fstat64 ++ fstatat ++ fstatat64 + fts_children + fts_open + fts_read +diff --git a/src/Makefile.am b/src/Makefile.am +index 60663452..eb311c0a 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \ + fopen64.c \ + freopen.c \ + freopen64.c \ ++ fstatat.c \ ++ fstatat64.c \ + fts.c \ + fts64.c \ + ftw.c \ +diff --git a/src/fstatat.c b/src/fstatat.c +new file mode 100644 +index 00000000..ca7578b3 +--- /dev/null ++++ b/src/fstatat.c +@@ -0,0 +1,42 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2021 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE_FSTATAT ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include ++#include ++#include "libfakechroot.h" ++ ++wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(fstatat)(dirfd, pathname, buf, flags); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/fstatat64.c b/src/fstatat64.c +new file mode 100644 +index 00000000..18633725 +--- /dev/null ++++ b/src/fstatat64.c +@@ -0,0 +1,43 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2021 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE_FSTATAT64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#define _LARGEFILE64_SOURCE ++#include ++#include ++#include "libfakechroot.h" ++ ++wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(fstatat64)(dirfd, pathname, buf, flags); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif + +From bc7ef087c17a475ec03768053fa22c2193ae7fc2 Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues +Date: Wed, 24 Aug 2022 08:26:04 +0200 +Subject: [PATCH 07/11] Wrap all functions accessing /etc/passwd, /etc/group + and /etc/shadow + +Starting with glibc 2.32 the compat nss module for getpwnam calls +__nss_files_fopen (which is a GLIBC_PRIVATE symbol provided by glibc) +instead of fopen (see 299210c1fa67e2dfb564475986fce11cd33db9ad). This +leads to getpwnam calls accessing /etc/passwd from *outside* the chroot +and as a result programs like adduser do not work correctly anymore +under fakechroot. + +Starting with glibc 2.34 the __nss_files_fopen was moved from nss to +libc.so and thus wrapping it with LD_PRELOAD has no affect anymore +(see 6212bb67f4695962748a5981e1b9fea105af74f6). + +So now we also wrap all the functions accessing /etc/passwd, /etc/group +and /etc/shadow. This solution will ignore NIS, LDAP or other local files +as potentially configured in /etc/nsswitch.conf. + +https://github.com/dex4er/fakechroot/pull/98 +--- + src/Makefile.am | 1 + + src/passwd.c | 296 +++++++++++++++++++++++++++++++++++++++++ + test/Makefile.am | 1 + + test/src/Makefile.am | 1 + + test/src/test-passwd.c | 28 ++++ + test/t/passwd.t | 23 ++++ + test/testtree.sh | 6 + + 7 files changed, 356 insertions(+) + create mode 100644 src/passwd.c + create mode 100644 test/src/test-passwd.c + create mode 100755 test/t/passwd.t + +diff --git a/src/Makefile.am b/src/Makefile.am +index eb311c0a..6e9d9ae1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -120,6 +120,7 @@ libfakechroot_la_SOURCES = \ + openat64.c \ + opendir.c \ + opendir.h \ ++ passwd.c \ + pathconf.c \ + popen.c \ + posix_spawn.c \ +diff --git a/src/passwd.c b/src/passwd.c +new file mode 100644 +index 00000000..d4cee86c +--- /dev/null ++++ b/src/passwd.c +@@ -0,0 +1,296 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2013 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++/* ++ * Starting with glibc 2.32 the compat nss module for getpwnam calls ++ * __nss_files_fopen (which is a GLIBC_PRIVATE symbol provided by glibc) ++ * instead of fopen (see 299210c1fa67e2dfb564475986fce11cd33db9ad). This ++ * leads to getpwnam calls accessing /etc/passwd from *outside* the chroot ++ * and as a result programs like adduser do not work correctly anymore ++ * under fakechroot. ++ * ++ * Starting with glibc 2.34 the __nss_files_fopen was moved from nss to ++ * libc.so and thus wrapping it with LD_PRELOAD has no affect anymore ++ * (see 6212bb67f4695962748a5981e1b9fea105af74f6). ++ * ++ * So now we also wrap all the functions accessing /etc/passwd, /etc/group ++ * and /etc/shadow. This solution will ignore NIS, LDAP or other local files ++ * as potentially configured in /etc/nsswitch.conf. ++ */ ++ ++#include ++#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 32) ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include "libfakechroot.h" ++ ++/* getpwent, setpwent, endpwent, getpwuid, getpwnam */ ++ ++static FILE *pw_f; ++ ++wrapper(getpwent, struct passwd *, (void)) ++{ ++ if (!pw_f) pw_f = fopen("/etc/passwd", "rbe"); ++ if (!pw_f) return 0; ++ return fgetpwent(pw_f); ++} ++ ++wrapper (getpwent_r, int, (struct passwd *pwbuf, char *buf, size_t buflen, struct passwd **pwbufp)) ++{ ++ if (!pw_f) pw_f = fopen("/etc/passwd", "rbe"); ++ if (!pw_f) return 0; ++ return fgetpwent_r(pw_f, pwbuf, buf, buflen, pwbufp); ++} ++ ++wrapper(setpwent, void, (void)) ++{ ++ if (pw_f) fclose(pw_f); ++ pw_f = 0; ++} ++ ++wrapper(endpwent, void, (void)) ++{ ++ if (pw_f) fclose(pw_f); ++ pw_f = 0; ++} ++ ++wrapper(getpwuid, struct passwd *, (uid_t uid)) ++{ ++ debug("getpwuid(\"%ul\")", uid); ++ FILE *f = fopen("/etc/passwd", "rbe"); ++ if (!f) { ++ return NULL; ++ } ++ struct passwd *res = NULL; ++ while ((res = fgetpwent(f))) { ++ if (res->pw_uid == uid) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getpwuid_r, int, (uid_t uid, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result)) ++{ ++ debug("getpwuid_r(\"%ul\")", uid); ++ FILE *f = fopen("/etc/passwd", "rbe"); ++ if (!f) { ++ return errno; ++ } ++ int res; ++ while (!(res = fgetpwent_r(f, pwd, buf, buflen, result))) { ++ if (pwd->pw_uid == uid) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getpwnam, struct passwd *, (const char *name)) ++{ ++ debug("getpwnam(\"%s\")", name); ++ FILE *f = fopen("/etc/passwd", "rbe"); ++ if (!f) { ++ return NULL; ++ } ++ struct passwd *res = NULL; ++ while ((res = fgetpwent(f))) { ++ if (name && !strcmp(name, res->pw_name)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getpwnam_r, int, (const char *name, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result)) ++{ ++ debug("getpwnam_r(\"%s\")", name); ++ FILE *f = fopen("/etc/passwd", "rbe"); ++ if (!f) { ++ return errno; ++ } ++ int res; ++ while (!(res = fgetpwent_r(f, pwd, buf, buflen, result))) { ++ if (name && !strcmp(name, pwd->pw_name)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++/* getgrent, setgrent, endgrent, getgrgid, getgrnam */ ++ ++static FILE *gr_f; ++ ++wrapper(getgrent, struct group *, (void)) ++{ ++ if (!gr_f) gr_f = fopen("/etc/group", "rbe"); ++ if (!gr_f) return 0; ++ return fgetgrent(gr_f); ++} ++ ++wrapper (getgrent_r, int, (struct group *gbuf, char *buf, size_t buflen, struct group **gbufp)) ++{ ++ if (!gr_f) gr_f = fopen("/etc/group", "rbe"); ++ if (!gr_f) return 0; ++ return fgetgrent_r(gr_f, gbuf, buf, buflen, gbufp); ++} ++ ++wrapper(setgrent, void, (void)) ++{ ++ if (gr_f) fclose(gr_f); ++ gr_f = 0; ++} ++ ++wrapper(endgrent, void, (void)) ++{ ++ if (gr_f) fclose(gr_f); ++ gr_f = 0; ++} ++ ++wrapper(getgrgid, struct group *, (gid_t gid)) ++{ ++ debug("getgrgid(\"%ul\")", gid); ++ FILE *f = fopen("/etc/group", "rbe"); ++ if (!f) { ++ return NULL; ++ } ++ struct group *res = NULL; ++ while ((res = fgetgrent(f))) { ++ if (res->gr_gid == gid) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getgrgid_r, int, (gid_t gid, struct group *grp, char *buf, size_t buflen, struct group **result)) ++{ ++ debug("getgrgid_r(\"%ul\")", gid); ++ FILE *f = fopen("/etc/group", "rbe"); ++ if (!f) { ++ return errno; ++ } ++ int res; ++ while (!(res = fgetgrent_r(f, grp, buf, buflen, result))) { ++ if (grp->gr_gid == gid) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getgrnam, struct group *, (const char *name)) ++{ ++ debug("getgrnam(\"%s\")", name); ++ FILE *f = fopen("/etc/group", "rbe"); ++ if (!f) { ++ return NULL; ++ } ++ struct group *res = NULL; ++ while ((res = fgetgrent(f))) { ++ if (name && !strcmp(name, res->gr_name)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getgrnam_r, int, (const char *name, struct group *grp, char *buf, size_t buflen, struct group **result)) ++{ ++ debug("getgrnam_r(\"%s\")", name); ++ FILE *f = fopen("/etc/group", "rbe"); ++ if (!f) { ++ return errno; ++ } ++ int res; ++ while (!(res = fgetgrent_r(f, grp, buf, buflen, result))) { ++ if (name && !strcmp(name, grp->gr_name)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++/* getspent, setspent, endspent, getspnam */ ++ ++static FILE *sp_f; ++ ++wrapper(getspent, struct spwd *, (void)) ++{ ++ if (!sp_f) sp_f = fopen("/etc/shadow", "rbe"); ++ if (!sp_f) return 0; ++ return fgetspent(sp_f); ++} ++ ++wrapper(setspent, void, (void)) ++{ ++ if (sp_f) fclose(sp_f); ++ sp_f = 0; ++} ++ ++wrapper(endspent, void, (void)) ++{ ++ if (sp_f) fclose(sp_f); ++ sp_f = 0; ++} ++ ++wrapper(getspnam, struct spwd *, (const char *name)) ++{ ++ debug("getspnam(\"%s\")", name); ++ FILE *f = fopen("/etc/shadow", "rbe"); ++ if (!f) { ++ return NULL; ++ } ++ struct spwd *res = NULL; ++ while ((res = fgetspent(f))) { ++ if (name && !strcmp(name, res->sp_namp)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getspnam_r, int, (const char *name, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **spbufp)) ++{ ++ debug("getspnam_r(\"%s\")", name); ++ FILE *f = fopen("/etc/shadow", "rbe"); ++ if (!f) { ++ return errno; ++ } ++ int res; ++ while (!(res = fgetspent_r(f, spbuf, buf, buflen, spbufp))) { ++ if (name && !strcmp(name, spbuf->sp_namp)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/test/Makefile.am b/test/Makefile.am +index 0021b0a1..a1ec743d 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -22,6 +22,7 @@ TESTS = \ + t/mkstemps.t \ + t/mktemp.t \ + t/opendir.t \ ++ t/passwd.t \ + t/popen.t \ + t/posix_spawn.t \ + t/posix_spawnp.t \ +diff --git a/test/src/Makefile.am b/test/src/Makefile.am +index 5f5fde8d..594a8e0f 100644 +--- a/test/src/Makefile.am ++++ b/test/src/Makefile.am +@@ -15,6 +15,7 @@ check_PROGRAMS = \ + test-mkstemps \ + test-mktemp \ + test-opendir \ ++ test-passwd \ + test-popen \ + test-posix_spawn \ + test-posix_spawnp \ +diff --git a/test/src/test-passwd.c b/test/src/test-passwd.c +new file mode 100644 +index 00000000..fb9c8c4c +--- /dev/null ++++ b/test/src/test-passwd.c +@@ -0,0 +1,28 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++int main (int argc, char *argv[]) { ++ struct passwd *pwd; ++ ++ if (argc != 2) { ++ fprintf(stderr, "Usage: %s username\n", argv[0]); ++ exit(EXIT_FAILURE); ++ } ++ ++ pwd = getpwnam(argv[1]); ++ if (pwd == NULL) { ++ if (errno == 0) { ++ printf("Not found\n"); ++ } else { ++ perror("getpwnam"); ++ } ++ exit(EXIT_FAILURE); ++ } ++ ++ printf("%jd\n", (intmax_t)(pwd->pw_uid)); ++ exit(EXIT_SUCCESS); ++} +diff --git a/test/t/passwd.t b/test/t/passwd.t +new file mode 100755 +index 00000000..5c3414e0 +--- /dev/null ++++ b/test/t/passwd.t +@@ -0,0 +1,23 @@ ++#!/bin/sh ++ ++srcdir=${srcdir:-.} ++. $srcdir/common.inc.sh ++ ++prepare 4 ++ ++for chroot in chroot fakechroot; do ++ if [ $chroot = "chroot" ] && ! is_root; then ++ skip $(( $tap_plan / 2 )) "not root" ++ else ++ ++ t=`$srcdir/$chroot.sh $testtree /bin/test-passwd user 2>&1` ++ test "$t" = "1337" || not ++ ok "$chroot uid is" $t ++ ++ t=`$srcdir/$chroot.sh $testtree getent group user 2>&1` ++ test "$t" = "user:x:1337:" || not ++ ok "$chroot getent group user is" $t ++ fi ++done ++ ++cleanup +diff --git a/test/testtree.sh b/test/testtree.sh +index ee35fc26..d857a195 100755 +--- a/test/testtree.sh ++++ b/test/testtree.sh +@@ -32,6 +32,10 @@ do + mkdir -p $destdir/$d + done + ++echo "user:x:1337:1337:user:/home/user:/bin/bash" > $destdir/etc/passwd ++echo "root:x:0:" > $destdir/etc/group ++echo "user:x:1337:" >> $destdir/etc/group ++ + for d in \ + /dev \ + /proc +@@ -64,6 +68,7 @@ for p in \ + '/usr/bin/dirname' \ + '/usr/bin/env' \ + '/usr/bin/find' \ ++ '/usr/bin/getent' \ + '/usr/bin/id' \ + '/usr/bin/ischroot' \ + '/usr/bin/less' \ +@@ -116,6 +121,7 @@ for p in \ + 'libm.so.*' \ + 'libncurses.so.*' \ + 'libncursesw.so.*' \ ++ 'libnss_*.so.*' \ + 'libpcre*.so.*' \ + 'libpthread.so.*' \ + 'libreadline.so.*' \ + +From d9a47178203931231987d10117acb5684d12ed4c Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues +Date: Tue, 1 Nov 2022 00:47:56 +0100 +Subject: [PATCH 08/11] add test/t/rm.t and amend test/t/touch.t with + --no-dereference test + + - test/t/rm.t will fail under glibc 2.34 unless __stat64_time64 functions are + wrapped + - test/t/touch.t will fail under glibc 2.34 unless __lstat64_time64 is + wrapped +--- + test/Makefile.am | 1 + + test/t/rm.t | 25 +++++++++++++++++++++++++ + test/t/touch.t | 17 +++++++++++++++-- + 3 files changed, 41 insertions(+), 2 deletions(-) + create mode 100755 test/t/rm.t + +diff --git a/test/Makefile.am b/test/Makefile.am +index a1ec743d..88e740e5 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -29,6 +29,7 @@ TESTS = \ + t/pwd.t \ + t/readlink.t \ + t/realpath.t \ ++ t/rm.t \ + t/socket-af_unix.t \ + t/statfs.t \ + t/statvfs.t \ +diff --git a/test/t/rm.t b/test/t/rm.t +new file mode 100755 +index 00000000..9ecf88c9 +--- /dev/null ++++ b/test/t/rm.t +@@ -0,0 +1,25 @@ ++#!/bin/sh ++ ++srcdir=${srcdir:-.} ++. $srcdir/common.inc.sh ++ ++prepare 2 ++ ++for chroot in chroot fakechroot; do ++ ++ if [ $chroot = "chroot" ] && ! is_root; then ++ skip $(( $tap_plan / 2 )) "not root" ++ else ++ ++ mkdir -p $testtree/dir-$chroot ++ echo 'something' > $testtree/dir-$chroot/file ++ ++ $srcdir/$chroot.sh $testtree /bin/sh -c "rm -r /dir-$chroot" ++ test -e $testtree/dir-$chroot && not ++ ok "$chroot rm -r /dir-$chroot:" $t ++ ++ fi ++ ++done ++ ++cleanup +diff --git a/test/t/touch.t b/test/t/touch.t +index fbea316b..cc05a2ba 100755 +--- a/test/t/touch.t ++++ b/test/t/touch.t +@@ -3,12 +3,12 @@ + srcdir=${srcdir:-.} + . $srcdir/common.inc.sh + +-prepare 16 ++prepare 24 + + . $srcdir/touch.inc.sh + + if [ -z "$touch" ]; then +- skip 16 "touch not found" ++ skip 24 "touch not found" + else + + for chroot in chroot fakechroot; do +@@ -37,6 +37,19 @@ else + + sleep 1 + ++ # with --no-dereference, on 32bit, touch will use __lstat64_time64 ++ t=`$srcdir/$chroot.sh $testtree $touch -h -r /tmp/$chroot-touch.txt /tmp/$chroot-touch2.txt 2>&1` ++ test "$t" = "" || not ++ ok "$chroot touch -r" $t ++ test -f $testtree/tmp/$chroot-touch2.txt || not ++ ok "$chroot $chroot-touch2.txt exists" ++ test $testtree/tmp/$chroot-touch2.txt -nt $testtree/tmp/$chroot-touch.txt && not ++ ok "$chroot $chroot-touch2.txt is not newer than touch.txt" ++ test $testtree/tmp/$chroot-touch2.txt -ot $testtree/tmp/$chroot-touch.txt && not ++ ok "$chroot $chroot-touch2.txt is not older than $chroot-touch.txt" ++ ++ sleep 1 ++ + t=`$srcdir/$chroot.sh $testtree $touch -m /tmp/$chroot-touch.txt 2>&1` + test "$t" = "" || not + ok "$chroot touch -m" $t + +From dac74cd68cfb6eeaae9cd13bdc48737a44980df9 Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues +Date: Tue, 1 Nov 2022 00:48:23 +0100 +Subject: [PATCH 09/11] support glibc 2.34 by wrapping + __{f,l,}stat{at,}64_time64 and__utime{nsat,s,}64 + +These functions are only wrapped on 32 bit platforms like i386, armel or +armhf. On 64 bit platforms, the corresponding HAVE_* macros will not be +defined. + + * __fstatat64_time64 + * __lstat64_time64 + * __stat64_time64 + * __utime64 + * __utimensat64 + * __utimes64 +--- + configure.ac | 6 +++++ + src/Makefile.am | 6 +++++ + src/__fstatat64_time64.c | 44 ++++++++++++++++++++++++++++++++++++ + src/__lstat64_time64.c | 49 ++++++++++++++++++++++++++++++++++++++++ + src/__stat64_time64.c | 47 ++++++++++++++++++++++++++++++++++++++ + src/__utime64.c | 41 +++++++++++++++++++++++++++++++++ + src/__utimensat64.c | 42 ++++++++++++++++++++++++++++++++++ + src/__utimes64.c | 42 ++++++++++++++++++++++++++++++++++ + 8 files changed, 277 insertions(+) + create mode 100644 src/__fstatat64_time64.c + create mode 100644 src/__lstat64_time64.c + create mode 100644 src/__stat64_time64.c + create mode 100644 src/__utime64.c + create mode 100644 src/__utimensat64.c + create mode 100644 src/__utimes64.c + +diff --git a/configure.ac b/configure.ac +index 5b3053e1..26c06116 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -158,11 +158,13 @@ ACX_CHECK_FTS_NAME_TYPE + # Checks for library functions. + AC_CHECK_FUNCS(m4_normalize([ + __chk_fail ++ __fstatat64_time64 + __fxstat64 + __fxstatat + __fxstatat64 + __getcwd_chk + __getwd_chk ++ __lstat64_time64 + __lxstat + __lxstat64 + __open +@@ -175,7 +177,11 @@ AC_CHECK_FUNCS(m4_normalize([ + __realpath_chk + __readlink_chk + __readlinkat_chk ++ __stat64_time64 + __statfs ++ __utime64 ++ __utimensat64 ++ __utimes64 + __xmknod + __xmknodat + __xstat +diff --git a/src/Makefile.am b/src/Makefile.am +index 6e9d9ae1..55193a96 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,9 +1,11 @@ + pkglib_LTLIBRARIES = libfakechroot.la + libfakechroot_la_SOURCES = \ ++ __fstatat64_time64.c \ + __fxstatat.c \ + __fxstatat64.c \ + __getcwd_chk.c \ + __getwd_chk.c \ ++ __lstat64_time64.c \ + __lxstat.c \ + __lxstat64.c \ + __lxstat64.h \ +@@ -18,7 +20,11 @@ libfakechroot_la_SOURCES = \ + __readlinkat_chk.c \ + __realpath_chk.c \ + __realpath_chk.h \ ++ __stat64_time64.c \ + __statfs.c \ ++ __utime64.c \ ++ __utimensat64.c \ ++ __utimes64.c \ + __xmknod.c \ + __xmknodat.c \ + __xstat.c \ +diff --git a/src/__fstatat64_time64.c b/src/__fstatat64_time64.c +new file mode 100644 +index 00000000..47a401f2 +--- /dev/null ++++ b/src/__fstatat64_time64.c +@@ -0,0 +1,44 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2021 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE___FSTATAT64_TIME64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include ++#include ++#include "libfakechroot.h" ++ ++struct __stat64_t64; ++ ++wrapper(__fstatat64_time64, int, (int dirfd, const char *pathname, struct __stat64_t64 *buf, int flags)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("__fstatat64_time64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(__fstatat64_time64)(dirfd, pathname, buf, flags); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/__lstat64_time64.c b/src/__lstat64_time64.c +new file mode 100644 +index 00000000..e3e84002 +--- /dev/null ++++ b/src/__lstat64_time64.c +@@ -0,0 +1,49 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2021 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE___LSTAT64_TIME64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include ++#include ++#include "libfakechroot.h" ++ ++struct __stat64_t64; ++ ++wrapper(__lstat64_time64, int, (const char *filename, struct __stat64_t64 *buf)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ char resolved[FAKECHROOT_PATH_MAX]; ++ debug("__lstat64_time64(\"%s\", &buf)", filename); ++ if (rel2abs(filename, resolved) == NULL) { ++ return -1; ++ } ++ filename = resolved; ++ expand_chroot_path(filename); ++ return nextcall(__lstat64_time64)(filename, buf); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/__stat64_time64.c b/src/__stat64_time64.c +new file mode 100644 +index 00000000..1b65345e +--- /dev/null ++++ b/src/__stat64_time64.c +@@ -0,0 +1,47 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010-2015 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE___STAT64_TIME64 ++ ++#define _BSD_SOURCE ++#define _LARGEFILE64_SOURCE ++#define _DEFAULT_SOURCE ++#include ++#include ++#include ++ ++#include "libfakechroot.h" ++ ++struct __stat64_t64; ++ ++wrapper(__stat64_time64, int, (const char * file_name, struct __stat64_t64 * buf)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("__stat64_time64(\"%s\", &buf)", file_name); ++ expand_chroot_path(file_name); ++ return nextcall(__stat64_time64)(file_name, buf); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/__utime64.c b/src/__utime64.c +new file mode 100644 +index 00000000..65d6e831 +--- /dev/null ++++ b/src/__utime64.c +@@ -0,0 +1,41 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2013 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE___UTIME64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include ++#include "libfakechroot.h" ++ ++wrapper(__utime64, int, (const char * filename, const struct utimbuf * buf)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("__utime64(\"%s\", &buf)", filename); ++ expand_chroot_path(filename); ++ return nextcall(__utime64)(filename, buf); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/__utimensat64.c b/src/__utimensat64.c +new file mode 100644 +index 00000000..3973d64c +--- /dev/null ++++ b/src/__utimensat64.c +@@ -0,0 +1,42 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2013 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE___UTIMENSAT64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include ++#include "libfakechroot.h" ++ ++ ++wrapper(__utimensat64, int, (int dirfd, const char * pathname, const struct timespec times [2], int flags)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("utimeat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(__utimensat64)(dirfd, pathname, times, flags); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/__utimes64.c b/src/__utimes64.c +new file mode 100644 +index 00000000..03e57d16 +--- /dev/null ++++ b/src/__utimes64.c +@@ -0,0 +1,42 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2013 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE___UTIMES64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++ ++#include ++#include "libfakechroot.h" ++ ++wrapper(__utimes64, int, (const char * filename, UTIMES_TYPE_ARG2(tv))) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("__utimes64(\"%s\", &tv)", filename); ++ expand_chroot_path(filename); ++ return nextcall(__utimes64)(filename, tv); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif + +From 117d2e6e741bc4ff47e41e6879ca9e9821755ffd Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues +Date: Tue, 31 Jan 2023 11:43:33 +0100 +Subject: [PATCH 10/11] also investigate .interp section for architectures that + do not list the linker in `objdump -p` like mips64el, ppc64el and s390x + +--- + scripts/ldd.fakechroot.pl | 33 +++++++++++++++++++++++++++++++++ + test/Makefile.am | 1 + + test/t/ldd_interp.t | 26 ++++++++++++++++++++++++++ + 3 files changed, 60 insertions(+) + create mode 100755 test/t/ldd_interp.t + +diff --git a/scripts/ldd.fakechroot.pl b/scripts/ldd.fakechroot.pl +index b4bb2a8c..13a94540 100755 +--- a/scripts/ldd.fakechroot.pl ++++ b/scripts/ldd.fakechroot.pl +@@ -124,6 +124,38 @@ sub objdump { + } + } + ++# mips64el, ppc64el and s390x do not list the linker itself ++# if it's missing, obtain it from the .interp section ++# ++# mips64el: /lib64/ld.so.1 ++# ppc64el: /lib64/ld64.so.2 ++# s390x: /lib/ld64.so.1 ++sub elfinterp { ++ my $file = shift; ++ my $res = ''; ++ local *PIPE; ++ open PIPE, "objdump -sj .interp '$file' 2>/dev/null |"; ++ while (my $line = ) { ++ if ( $line !~ /^ [a-f0-9]+ ([a-f0-9][a-f0-9][a-f0-9 ]{6} [a-f0-9 ]{8} [a-f0-9 ]{8} [a-f0-9 ]{8}) /) { ++ next; ++ } ++ $line = $1; ++ $line =~ s/ //g; ++ $line =~ s/(..)/chr(hex($1))/eg; ++ $res .= $line; ++ } ++ close PIPE; ++ ++ # remove trailing NUL byte ++ $res =~ s/\000$//; ++ ++ # only add if it is missing ++ if ( $res && !exists $Libs{$res} ) { ++ push @Libs, $res; ++ $Libs{$res} = ''; ++ } ++} ++ + + sub load_ldsoconf { + my ($file) = @_; +@@ -191,6 +223,7 @@ sub load_ldsoconf { + } + + objdump($file); ++ elfinterp($file_in_chroot); + + if ($Dynamic == 0) { + print "\tnot a dynamic executable\n"; +diff --git a/test/Makefile.am b/test/Makefile.am +index 88e740e5..d7f98f03 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -19,6 +19,7 @@ TESTS = \ + t/host.t \ + t/java.t \ + t/jemalloc.t \ ++ t/ldd_interp.t \ + t/mkstemps.t \ + t/mktemp.t \ + t/opendir.t \ +diff --git a/test/t/ldd_interp.t b/test/t/ldd_interp.t +new file mode 100755 +index 00000000..7c968bb8 +--- /dev/null ++++ b/test/t/ldd_interp.t +@@ -0,0 +1,26 @@ ++#!/bin/sh ++ ++srcdir=${srcdir:-.} ++. $srcdir/common.inc.sh ++ ++plan 1 ++ ++pwd=`dirname $0` ++abs_top_srcdir=${abs_top_srcdir:-`cd "$pwd/../.." 2>/dev/null && pwd -P`} ++ ++interp_file=$(file /bin/true | sed 's/^.*, interpreter \([^,]\+\), .*$/\1/') ++interp_readelf=$(readelf --string-dump=.interp /bin/true | sed -ne 's/^ \[ \+[0-9]\+\] //p') ++ ++# diag "$interp_file" "$interp_readelf" ++ ++test "$interp_file" = "$interp_readelf" || not ++ ++# ldd /bin/true | diag ++ ++ldd /bin/true | grep --quiet "^[[:space:]]$interp_file (" || not ++ ++# "$abs_top_srcdir/scripts/ldd.fakechroot" /bin/true | diag ++ ++"$abs_top_srcdir/scripts/ldd.fakechroot" /bin/true | grep --quiet "^[[:space:]]$interp_file (" || not ++ ++ok "ldd lists interpreter $interp_file" + +From 1617833d4bfa415cbe2fc1e961cb751e47697c24 Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues +Date: Mon, 6 Feb 2023 10:42:40 +0100 +Subject: [PATCH 11/11] test/touch.inc.sh: use testtree variable + + - the variable is set in test/common.inc.sh and includes `basename $0 .t` + - otherwise test/t/touch.t will always get skipped +--- + test/touch.inc.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/touch.inc.sh b/test/touch.inc.sh +index 25e0dc01..76c21321 100644 +--- a/test/touch.inc.sh ++++ b/test/touch.inc.sh +@@ -1,6 +1,6 @@ +-if [ -x testtree/usr/bin/touch ]; then ++if [ -x $testtree/usr/bin/touch ]; then + touch=/usr/bin/touch +-elif [ -x testtree/bin/touch ]; then ++elif [ -x $testtree/bin/touch ]; then + touch=/bin/touch + else + touch= diff --git a/system/fakechroot/patches/80.patch b/system/fakechroot/patches/80.patch new file mode 100644 index 0000000000..86e586017d --- /dev/null +++ b/system/fakechroot/patches/80.patch @@ -0,0 +1,22 @@ +From e291eb96db42f20a55f917aae660d416d624acaa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= +Date: Fri, 4 Dec 2020 09:30:42 -0500 +Subject: [PATCH] Fix typo in AC_PATH_PROG for ldconfig + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f8cdb323..d391494d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -49,7 +49,7 @@ AC_PATH_PROG([ENV], [env], [/usr/bin/env], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/l + AC_PATH_PROG([FAKEROOT], [fakeroot], [/usr/bin/fakeroot], [/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:$PATH]) + AC_PATH_PROG([INSSERV], [insserv], [/sbin/insserv], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH]) + AC_PATH_PROG([ISCHROOT], [ischroot], [/usr/bin/ischroot], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH]) +-AC_PATH_PROG([LDCONFIG], [ldconfig], [/sbin/chroot], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH]) ++AC_PATH_PROG([LDCONFIG], [ldconfig], [/sbin/ldconfig], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH]) + AC_PATH_PROG([LDD], [ldd], [/usr/bin/ldd], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH]) + AC_PATH_PROG([LS], [ls], [/bin/ls], [/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH]) + AC_PATH_PROG([MKFIFO], [mkfifo], [/usr/bin/mkfifo], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH]) diff --git a/system/fakechroot/patches/autoupdate.patch b/system/fakechroot/patches/autoupdate.patch new file mode 100644 index 0000000000..9393713497 --- /dev/null +++ b/system/fakechroot/patches/autoupdate.patch @@ -0,0 +1,40 @@ +--- fakechroot-2.20.1.orig/configure.ac 2019-03-22 21:02:42.000000000 +0000 ++++ fakechroot-2.20.1/configure.ac 2023-02-09 00:46:10.059938547 +0000 +@@ -1,10 +1,10 @@ +-AC_PREREQ(2.64) +-AC_INIT([fakechroot], [2.20.1], [dexter@debian.org], [fakechroot], [https://github.com/dex4er/fakechroot]) ++AC_PREREQ([2.71]) ++AC_INIT([fakechroot],[2.20.1],[dexter@debian.org],[fakechroot],[https://github.com/dex4er/fakechroot]) + + AC_CONFIG_SRCDIR([src/libfakechroot.c]) + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) +-AC_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + AM_INIT_AUTOMAKE([1.10 foreign]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +@@ -19,8 +19,8 @@ AM_PROG_AR + AC_PROG_CC + AC_PROG_MAKE_SET + AC_PROG_LN_S +-AM_PROG_LIBTOOL +-AM_PROG_NM ++LT_INIT ++LT_PATH_NM + LT_INIT + + AC_CANONICAL_HOST +@@ -77,7 +77,11 @@ AC_CHECK_LIB([dl], [dlsym]) + + # Checks for header files. + AC_HEADER_DIRENT +-AC_HEADER_STDC ++# Autoupdate added the next two lines to ensure that your configure ++# script's behavior did not change. They are probably safe to remove. ++AC_CHECK_INCLUDES_DEFAULT ++AC_PROG_EGREP ++ + AC_CHECK_HEADERS(m4_normalize([ + alloca.h + dirent.h diff --git a/system/fakechroot/patches/b42d1fb9538f680af2f31e864c555414ccba842a.patch b/system/fakechroot/patches/b42d1fb9538f680af2f31e864c555414ccba842a.patch new file mode 100644 index 0000000000..5e4a96e709 --- /dev/null +++ b/system/fakechroot/patches/b42d1fb9538f680af2f31e864c555414ccba842a.patch @@ -0,0 +1,102 @@ +From b42d1fb9538f680af2f31e864c555414ccba842a Mon Sep 17 00:00:00 2001 +From: Piotr Roszatycki +Date: Mon, 10 Feb 2020 13:59:10 -0800 +Subject: [PATCH] New `statx` function + +--- + NEWS.md | 1 + + configure.ac | 1 + + src/Makefile.am | 1 + + src/statx.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 47 insertions(+) + create mode 100644 src/statx.c + +diff --git a/NEWS.md b/NEWS.md +index 9de12fe..f1210bf 100644 +--- a/NEWS.md ++++ b/NEWS.md +@@ -1,5 +1,10 @@ + # NEWS + ++XX Xxx XXXX ++ ++* UNRELEASED ++* New `statx(2)` function was added: glibc supports it since 2.28. ++ + ## Version 2.20.1 + + 22 Mar 2019 +diff --git a/configure.ac b/configure.ac +index a654edd..f8cdb32 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -277,6 +277,7 @@ AC_CHECK_FUNCS(m4_normalize([ + statfs64 + statvfs + statvfs64 ++ statx + stpcpy + strchrnul + strlcpy +diff --git a/src/Makefile.am b/src/Makefile.am +index d729b0e..6066345 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -152,6 +152,7 @@ libfakechroot_la_SOURCES = \ + statfs64.c \ + statvfs.c \ + statvfs64.c \ ++ statx.c \ + stpcpy.c \ + strchrnul.c \ + strchrnul.h \ +diff --git a/src/statx.c b/src/statx.c +new file mode 100644 +index 0000000..524f73e +--- /dev/null ++++ b/src/statx.c +@@ -0,0 +1,44 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010-2020 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE_STATX ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++ ++#include "libfakechroot.h" ++ ++ ++wrapper(statx, int, (int dirfd, const char * pathname, int flags, unsigned int mask, struct statx * statxbuf)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("statx(%d, \"%s\", %d, %u, &statxbuf)", dirfd, pathname, flags, mask); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(statx)(dirfd, pathname, flags, mask, statxbuf); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif diff --git a/system/fakechroot/patches/disable_cp.t.patch b/system/fakechroot/patches/disable_cp.t.patch new file mode 100644 index 0000000000..1a7f90105d --- /dev/null +++ b/system/fakechroot/patches/disable_cp.t.patch @@ -0,0 +1,11 @@ +t/cp.t is problematic since RHEL 6 and 7 seems to me is a problem with the test and not with coreutils version +--- ./test/Makefile.am.orig 2023-04-06 02:04:58.107925212 +0100 ++++ ./test/Makefile.am 2023-04-06 02:05:03.453907064 +0100 +@@ -7,7 +7,6 @@ TESTS = \ + t/chroot.t \ + t/clearenv.t \ + t/cmd-subst.t \ +- t/cp.t \ + t/dedotdot.t \ + t/dladdr.t \ + t/execlp.t \ diff --git a/system/fakechroot/patches/fix_test_on_32bits.patch b/system/fakechroot/patches/fix_test_on_32bits.patch new file mode 100644 index 0000000000..26687f7f61 --- /dev/null +++ b/system/fakechroot/patches/fix_test_on_32bits.patch @@ -0,0 +1,38 @@ +removing leading / for some reason cp doesn't like it + +new coreutils already have -a and can replace -dp + +man cp + +-a, --archive same as -dR --preserve=all +-d same as --no-dereference --preserve=links +-p same as --preserve=mode,ownership,timestamps +--- fakechroot-2.20.1/test/t/cp.t 2019-03-22 21:02:42.000000000 +0000 ++++ fakechroot-2.20.1/test/t/cp.t 2022-03-04 02:07:11.511455404 +0000 +@@ -7,7 +7,7 @@ prepare 4 + + case "`uname -s`" in + Linux|KFreeBSD) +- CP_ARGS=-dp;; ++ CP_ARGS="--preserve=all";; + *) + CP_ARGS=-a;; + esac +@@ -19,13 +19,13 @@ for chroot in chroot fakechroot; do + else + + echo 'something' > $testtree/file-$chroot +- ln -s /file-$chroot $testtree/symlink-$chroot ++ ln -s file-$chroot $testtree/symlink-$chroot + +- t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS /file-$chroot /file2-$chroot; cat /file2-$chroot" 2>&1` ++ t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS file-$chroot file2-$chroot; cat /file2-$chroot" 2>&1` + test "$t" = "something" || not +- ok "$chroot cp $CP_ARGS /file-$chroot /file2-$chroot:" $t ++ ok "$chroot cp $CP_ARGS file-$chroot file2-$chroot:" $t + +- t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS /symlink-$chroot /symlink2-$chroot; cat /symlink2-$chroot" 2>&1` ++ t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS symlink-$chroot symlink2-$chroot; cat /symlink2-$chroot" 2>&1` + test "$t" = "something" || not + ok "$chroot cp $CP_ARGS /symlink-$chroot /symlink2-$chroot:" $t + diff --git a/system/font-manager/README b/system/font-manager/README index 39ced4b145..ae03670104 100644 --- a/system/font-manager/README +++ b/system/font-manager/README @@ -1,7 +1,4 @@ A simple font management application for GTK+ Desktop Environments. -Optional dependency: webkit2gtk, autodetected at build time. This is -required if you want Google Fonts integration. - Optional dependency: file-roller. This is a runtime dependency, not required at build time. diff --git a/system/font-manager/font-manager.SlackBuild b/system/font-manager/font-manager.SlackBuild index aa2ee5f0b8..4a96b7df9f 100644 --- a/system/font-manager/font-manager.SlackBuild +++ b/system/font-manager/font-manager.SlackBuild @@ -34,8 +34,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=font-manager -VERSION=${VERSION:-0.8.8} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.9.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/font-manager/font-manager.info b/system/font-manager/font-manager.info index 65904076ba..22200903ed 100644 --- a/system/font-manager/font-manager.info +++ b/system/font-manager/font-manager.info @@ -1,8 +1,8 @@ PRGNAM="font-manager" -VERSION="0.8.8" +VERSION="0.9.4" HOMEPAGE="http://fontmanager.github.io/" -DOWNLOAD="https://github.com/FontManager/font-manager/releases/download/0.8.8/font-manager-0.8.8.tar.xz" -MD5SUM="1a898600f7153aa685694bd90c847c9c" +DOWNLOAD="https://github.com/FontManager/font-manager/releases/download/0.9.4/font-manager-0.9.4.tar.xz" +MD5SUM="81a9735ad137f8ca3e4b112502ccabd6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yelp-tools" diff --git a/system/freeipmi/freeipmi.SlackBuild b/system/freeipmi/freeipmi.SlackBuild index d7e8565894..16148df4d6 100644 --- a/system/freeipmi/freeipmi.SlackBuild +++ b/system/freeipmi/freeipmi.SlackBuild @@ -86,9 +86,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -patch -p1 < $CWD/prototype.patch -patch -p1 < $CWD/header.patch -patch -p1 < $CWD/include.patch +patch -p1 < $CWD/patches/c23.patch +patch -p1 < $CWD/patches/prototype.patch +patch -p1 < $CWD/patches/header.patch +patch -p1 < $CWD/patches/include.patch autoreconf -vi diff --git a/system/freeipmi/patches/c23.patch b/system/freeipmi/patches/c23.patch new file mode 100644 index 0000000000..3828d0f716 --- /dev/null +++ b/system/freeipmi/patches/c23.patch @@ -0,0 +1,22 @@ +diff --git a/common/toolcommon/tool-config-file-common.c b/common/toolcommon/tool-config-file-common.c +index 609e7a3b3..20dfad512 100644 +--- a/common/toolcommon/tool-config-file-common.c ++++ b/common/toolcommon/tool-config-file-common.c +@@ -78,14 +78,14 @@ _config_file_bool (conffile_t cf, + void *app_ptr, + int app_data) + { +- int *bool; ++ int *value; + + assert (data); + assert (optionname); + assert (option_ptr); + +- bool = (int *)option_ptr; +- *bool = data->boolval; ++ value = (int *)option_ptr; ++ *value = data->boolval; + return (0); + } + diff --git a/system/freeipmi/header.patch b/system/freeipmi/patches/header.patch similarity index 100% rename from system/freeipmi/header.patch rename to system/freeipmi/patches/header.patch diff --git a/system/freeipmi/include.patch b/system/freeipmi/patches/include.patch similarity index 100% rename from system/freeipmi/include.patch rename to system/freeipmi/patches/include.patch diff --git a/system/freeipmi/prototype.patch b/system/freeipmi/patches/prototype.patch similarity index 100% rename from system/freeipmi/prototype.patch rename to system/freeipmi/patches/prototype.patch diff --git a/system/fsv/fsv.SlackBuild b/system/fsv/fsv.SlackBuild index 9384da8e2f..fa8f6ee2f4 100644 --- a/system/fsv/fsv.SlackBuild +++ b/system/fsv/fsv.SlackBuild @@ -79,7 +79,7 @@ sed -i \ sed -i 's/@DATADIRNAME@/share/' po/Makefile.in.in ./autogen.sh -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/gnome-disk-utility/66.patch b/system/gnome-disk-utility/66.patch new file mode 100644 index 0000000000..224e09a32d --- /dev/null +++ b/system/gnome-disk-utility/66.patch @@ -0,0 +1,95 @@ +From 5c80d88f6c2662d215e3c00ef0012756bece8d3b Mon Sep 17 00:00:00 2001 +From: Manuel Wassermann +Date: Wed, 30 Mar 2022 13:56:41 +0200 +Subject: [PATCH 1/3] gduatasmartdialog: Replace deprecated GIO function + +--- + src/disks/gduatasmartdialog.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/disks/gduatasmartdialog.c b/src/disks/gduatasmartdialog.c +index da3116c17..2deb6618c 100644 +--- a/src/disks/gduatasmartdialog.c ++++ b/src/disks/gduatasmartdialog.c +@@ -1684,15 +1684,15 @@ gdu_ata_smart_dialog_show (GduWindow *window, + + action = g_simple_action_new ("short", NULL); + g_signal_connect (action, "activate", G_CALLBACK (on_selftest_short), data); +- g_simple_action_group_insert (group, G_ACTION (action)); ++ g_action_map_add_action (G_ACTION_MAP (group), G_ACTION (action)); + + action = g_simple_action_new ("extended", NULL); + g_signal_connect (action, "activate", G_CALLBACK (on_selftest_extended), data); +- g_simple_action_group_insert (group, G_ACTION (action)); ++ g_action_map_add_action (G_ACTION_MAP (group), G_ACTION (action)); + + action = g_simple_action_new ("conveyance", NULL); + g_signal_connect (action, "activate", G_CALLBACK (on_selftest_conveyance), data); +- g_simple_action_group_insert (group, G_ACTION (action)); ++ g_action_map_add_action (G_ACTION_MAP (group), G_ACTION (action)); + + gtk_widget_insert_action_group (GTK_WIDGET (data->dialog), "test", G_ACTION_GROUP (group)); + +-- +GitLab + + +From 1e42b8796e69d922382c91b5313cc8f86e871186 Mon Sep 17 00:00:00 2001 +From: Manuel Wassermann +Date: Wed, 30 Mar 2022 14:06:31 +0200 +Subject: [PATCH 2/3] gduformatdiskdialog: Fix parameter of g_signal_connect () + and remove unused variable + +--- + src/disks/gduformatdiskdialog.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/disks/gduformatdiskdialog.c b/src/disks/gduformatdiskdialog.c +index 44a0280a0..2a0311722 100644 +--- a/src/disks/gduformatdiskdialog.c ++++ b/src/disks/gduformatdiskdialog.c +@@ -436,7 +436,6 @@ gdu_format_disk_dialog_show (GduWindow *window, + UDisksObject *object) + { + FormatDiskData *data; +- gint response; + + data = g_new0 (FormatDiskData, 1); + data->window = g_object_ref (window); +@@ -470,6 +469,6 @@ gdu_format_disk_dialog_show (GduWindow *window, + gtk_widget_show_all (data->dialog); + gtk_widget_grab_focus (data->type_combobox); + +- g_signal_connect (data->dialog, "response", dialog_response_cb, data); ++ g_signal_connect (data->dialog, "response", G_CALLBACK (dialog_response_cb), data); + gtk_window_present (GTK_WINDOW (data->dialog)); + } +-- +GitLab + + +From 465e2e45547ea586923f4be152f0caed112f8b25 Mon Sep 17 00:00:00 2001 +From: Manuel Wassermann +Date: Wed, 30 Mar 2022 14:09:27 +0200 +Subject: [PATCH 3/3] gduapplication: Fix parameter of g_signal_connect () + +--- + src/disks/gduapplication.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/disks/gduapplication.c b/src/disks/gduapplication.c +index b97c38293..bca06e6bf 100644 +--- a/src/disks/gduapplication.c ++++ b/src/disks/gduapplication.c +@@ -354,7 +354,7 @@ about_activated (GSimpleAction *action, + + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (app->window)); + gtk_widget_show_all (dialog); +- g_signal_connect (dialog, "response", on_about_dialog_response, NULL); ++ g_signal_connect (dialog, "response", G_CALLBACK (on_about_dialog_response), NULL); + gtk_window_present (GTK_WINDOW (dialog)); + } + +-- +GitLab + diff --git a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild index 9cd4575abf..03f19fba61 100644 --- a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild +++ b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild @@ -87,6 +87,8 @@ else echo "gnome-settings-daemon not found, disabling plugin." fi +patch -p1 < $CWD/66.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/system/gnome-vfs/gnome-vfs.SlackBuild b/system/gnome-vfs/gnome-vfs.SlackBuild index c30e90ed9b..6ebf3c71b1 100644 --- a/system/gnome-vfs/gnome-vfs.SlackBuild +++ b/system/gnome-vfs/gnome-vfs.SlackBuild @@ -79,12 +79,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p0 < $CWD/openssl-1.1.patch +for i in $CWD/patches/* ; do patch -p1 < $i ; done # Fix for the newer glib sed -i "/-DG_DISABLE_DEPRECATED/d" */Makefile.* -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu17" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/system/gnome-vfs/openssl-1.1.patch b/system/gnome-vfs/openssl-1.1.patch deleted file mode 100644 index 14207f28d1..0000000000 --- a/system/gnome-vfs/openssl-1.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $ - -struct SSL is opaque in openssl-1.1; and the SSL_free() man page -says that one should not free members of it manually (in both -the openssl-1.0 and openssl-1.1 man pages). - ---- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000 -+++ libgnomevfs/gnome-vfs-ssl.c -@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS - } - } - -- if (ssl->private->ssl->ctx) -- SSL_CTX_free (ssl->private->ssl->ctx); -- - SSL_free (ssl->private->ssl); - g_free (ssl->private); - g_free (ssl); -@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl, - } - } - -- SSL_CTX_free (ssl->private->ssl->ctx); - SSL_free (ssl->private->ssl); - close (ssl->private->sockfd); - if (ssl->private->timeout) diff --git a/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch b/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch new file mode 100644 index 0000000000..438a89de6e --- /dev/null +++ b/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch @@ -0,0 +1,20 @@ +--- gnome-vfs-2.8.2/schemas/desktop_gnome_url_handlers.schemas.in.browser_default 2004-10-18 21:38:08.605885937 -0400 ++++ gnome-vfs-2.8.2/schemas/desktop_gnome_url_handlers.schemas.in 2004-10-18 21:38:20.470253994 -0400 +@@ -153,7 +153,7 @@ + /desktop/gnome/url-handlers/http/command + gnome + string +- epiphany %s ++ gio open %s + + The handler for "http" URLs + The command used to handle "http" URLs, if enabled. +@@ -187,7 +187,7 @@ + /desktop/gnome/url-handlers/https/command + gnome + string +- epiphany %s ++ gio open %s + + The handler for "https" URLs + The command used to handle "https" URLs, if enabled. diff --git a/system/gnome-vfs/patches/gnome-vfs2-c99.patch b/system/gnome-vfs/patches/gnome-vfs2-c99.patch new file mode 100644 index 0000000000..a8b9b5d416 --- /dev/null +++ b/system/gnome-vfs/patches/gnome-vfs2-c99.patch @@ -0,0 +1,16 @@ +Include for the g_printf function. This avoids an +implicit function declaration and build failures with future +compilers. + +diff --git a/test/test-async-directory.c b/test/test-async-directory.c +index 2698d8e6e41f9ead..8d7e0f320edbb5fc 100644 +--- a/test/test-async-directory.c ++++ b/test/test-async-directory.c +@@ -24,6 +24,7 @@ + #include + + #include ++#include + #include + #include + #include diff --git a/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch b/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch new file mode 100644 index 0000000000..829c31f0c6 --- /dev/null +++ b/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch @@ -0,0 +1,21 @@ +Avoid an implicit int and an implicit declaration of exit. This +prevents build failures with future compilers. + +diff --git a/configure.in b/configure.in +index 1a0ad1be03f9f9fe..011c1d919885536a 100644 +--- a/configure.in ++++ b/configure.in +@@ -366,11 +366,11 @@ AC_TRY_RUN([ + + struct linger li; + +-main () ++int main (void) + { + li.l_onoff = 1; + li.l_linger = 120; +- exit (0); ++ return 0; + } + ],[ + AC_DEFINE(HAVE_STRUCT_LINGER, 1, [Define to 1 if struct linger is available]) diff --git a/system/gnome-vfs/patches/openssl-1.1.patch b/system/gnome-vfs/patches/openssl-1.1.patch new file mode 100644 index 0000000000..3ed1d5edad --- /dev/null +++ b/system/gnome-vfs/patches/openssl-1.1.patch @@ -0,0 +1,26 @@ +$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $ + +struct SSL is opaque in openssl-1.1; and the SSL_free() man page +says that one should not free members of it manually (in both +the openssl-1.0 and openssl-1.1 man pages). + +--- ./libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000 ++++ ./libgnomevfs/gnome-vfs-ssl.c +@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS + } + } + +- if (ssl->private->ssl->ctx) +- SSL_CTX_free (ssl->private->ssl->ctx); +- + SSL_free (ssl->private->ssl); + g_free (ssl->private); + g_free (ssl); +@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl, + } + } + +- SSL_CTX_free (ssl->private->ssl->ctx); + SSL_free (ssl->private->ssl); + close (ssl->private->sockfd); + if (ssl->private->timeout) diff --git a/system/heirloom-sh/heirloom-sh-glibc-2.34.patch b/system/heirloom-sh/heirloom-sh-glibc-2.34.patch new file mode 100644 index 0000000000..35cb565526 --- /dev/null +++ b/system/heirloom-sh/heirloom-sh-glibc-2.34.patch @@ -0,0 +1,18 @@ +--- a/fault.c ++++ b/fault.c +@@ -43,6 +43,15 @@ + #include + #include + ++#if __GLIBC__ >= 2 ++# undef SIGSTKSZ ++# if defined __ia64__ ++# define SIGSTKSZ 262144 ++# else ++# define SIGSTKSZ 65536 ++# endif ++#endif ++ + static void (*psig0_func)() = SIG_ERR; /* previous signal handler for signal 0 */ + static char sigsegv_stack[SIGSTKSZ]; + diff --git a/system/heirloom-sh/heirloom-sh.SlackBuild b/system/heirloom-sh/heirloom-sh.SlackBuild index b805981e57..ce9edf218e 100644 --- a/system/heirloom-sh/heirloom-sh.SlackBuild +++ b/system/heirloom-sh/heirloom-sh.SlackBuild @@ -61,6 +61,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/heirloom-sh-glibc-2.34.patch + # configure is the worst way to build a package except for all the others # 1. make static changes to the makefile with a patch patch -p1 < $CWD/makefile.patch diff --git a/system/iotop/iotop.SlackBuild b/system/iotop/iotop.SlackBuild index 9b57f5a9d0..526baad141 100644 --- a/system/iotop/iotop.SlackBuild +++ b/system/iotop/iotop.SlackBuild @@ -69,7 +69,7 @@ patch -p1 < $CWD/fix-proc-status-read.patch sed -i 's|share/man/man8|man/man8|' setup.py -python setup.py install --root=$PKG +python2 setup.py install --root=$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 diff --git a/system/ipmitool/ipmitool.SlackBuild b/system/ipmitool/ipmitool.SlackBuild index 44b9d6702d..5b4e408afc 100644 --- a/system/ipmitool/ipmitool.SlackBuild +++ b/system/ipmitool/ipmitool.SlackBuild @@ -1,35 +1,49 @@ #!/bin/bash -# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST -# Copyright 2009 Eric Hameleers , Eindhoven, Netherlands # Slackware build script for ipmitool # Written by Zordrak - -# Based on http://slackbuilds.org/template.SlackBuild - # Modified by Mario Preksavec # Updated by Emmanuel N. Millan +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ipmitool -VERSION=${VERSION:-1.8.18} +VERSION=${VERSION:-1.8.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +SRCNAM=IPMITOOL +SRCVER=1_8_19 + +# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -53,14 +67,14 @@ else LIBDIRSUFFIX="" fi -set -e +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 +tar xvf $CWD/$SRCNAM\_$SRCVER.tar.gz +cd $PRGNAM chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -68,8 +82,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 {} \; -# Apply a lot of patches (thanks, fedora!) -for i in $CWD/patches/* ; do patch -p1 < $i ; done aclocal libtoolize --automake --copy autoheader @@ -83,14 +95,18 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ --build=$ARCH-slackware-linux -make DOCDIR=/usr/doc/$PRGNAM-$VERSION -make DOCDIR=/usr/doc/$PRGNAM-$VERSION install DESTDIR=$PKG +make +make install DESTDIR=$PKG + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -98,11 +114,15 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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 -cp -a contrib $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS ChangeLog README \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +#cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/ipmitool/ipmitool.info b/system/ipmitool/ipmitool.info index 4d4c029cad..a37552c952 100644 --- a/system/ipmitool/ipmitool.info +++ b/system/ipmitool/ipmitool.info @@ -1,8 +1,8 @@ PRGNAM="ipmitool" -VERSION="1.8.18" -HOMEPAGE="http://ipmitool.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/project/ipmitool/ipmitool/1.8.18/ipmitool-1.8.18.tar.bz2" -MD5SUM="bab7ea104c7b85529c3ef65c54427aa3" +VERSION="1.8.19" +HOMEPAGE="https://codeberg.org/IPMITool/ipmitool" +DOWNLOAD="https://codeberg.org/IPMITool/ipmitool/archive/IPMITOOL_1_8_19.tar.gz" +MD5SUM="a4bbf84c156fbc85f5a304d8a753fef8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ipmitool/patches/0001-CVE-2011-4339-OpenIPMI.patch b/system/ipmitool/patches/0001-CVE-2011-4339-OpenIPMI.patch deleted file mode 100644 index 437c9adaf9..0000000000 --- a/system/ipmitool/patches/0001-CVE-2011-4339-OpenIPMI.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 152efd46931a70ab4e3d81e99d312df7dcd666e6 Mon Sep 17 00:00:00 2001 -From: Boris Ranto -Date: Tue, 10 May 2016 19:12:08 +0200 -Subject: [PATCH] CVE-2011-4339 OpenIPMI - -IPMI event daemon creates PID file with world writeable permissions ---- - lib/helper.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lib/helper.c b/lib/helper.c -index de91438..c3a1c80 100644 ---- a/lib/helper.c -+++ b/lib/helper.c -@@ -829,7 +829,6 @@ ipmi_start_daemon(struct ipmi_intf *intf) - #endif - - chdir("/"); -- umask(0); - - for (fd=0; fd<64; fd++) { - if (fd != intf->fd) --- -2.7.4 - diff --git a/system/ipmitool/patches/0002-openssl.patch b/system/ipmitool/patches/0002-openssl.patch deleted file mode 100644 index ff5e7051bf..0000000000 --- a/system/ipmitool/patches/0002-openssl.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -urNp old/src/plugins/lanplus/lanplus_crypt_impl.c new/src/plugins/lanplus/lanplus_crypt_impl.c ---- old/src/plugins/lanplus/lanplus_crypt_impl.c 2016-05-28 10:20:20.000000000 +0200 -+++ new/src/plugins/lanplus/lanplus_crypt_impl.c 2017-02-21 10:50:21.634873466 +0100 -@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_ - uint8_t * output, - uint32_t * bytes_written) - { -- EVP_CIPHER_CTX ctx; -- EVP_CIPHER_CTX_init(&ctx); -- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(ctx); -+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); - - - *bytes_written = 0; -@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ - assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); - - -- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) -+ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) - { - /* Error */ - *bytes_written = 0; -@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ - { - uint32_t tmplen; - -- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) -+ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) - { - *bytes_written = 0; - return; /* Error */ -@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_ - { - /* Success */ - *bytes_written += tmplen; -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - } - } - } -@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_ - uint8_t * output, - uint32_t * bytes_written) - { -- EVP_CIPHER_CTX ctx; -- EVP_CIPHER_CTX_init(&ctx); -- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(ctx); -+ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); - - - if (verbose >= 5) -@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ - assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); - - -- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) -+ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) - { - /* Error */ - lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); -@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ - { - uint32_t tmplen; - -- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) -+ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) - { - char buffer[1000]; - ERR_error_string(ERR_get_error(), buffer); -@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_ - { - /* Success */ - *bytes_written += tmplen; -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - } - } - diff --git a/system/ipmitool/patches/0003-ipmitool-1.8.11-set-kg-key.patch b/system/ipmitool/patches/0003-ipmitool-1.8.11-set-kg-key.patch deleted file mode 100644 index 00a396e230..0000000000 --- a/system/ipmitool/patches/0003-ipmitool-1.8.11-set-kg-key.patch +++ /dev/null @@ -1,240 +0,0 @@ -diff -urNp old/doc/ipmitool.1 new/doc/ipmitool.1 ---- old/doc/ipmitool.1 2017-02-06 10:20:02.254362909 +0100 -+++ new/doc/ipmitool.1 2017-02-06 10:33:41.729294474 +0100 -@@ -372,6 +372,20 @@ Configure user access information on the - - Displays the list of cipher suites supported for the given - application (ipmi or sol) on the given channel. -+.TP -+\fIsetkg\fP <\fIhex\fP|\fIplain\fP> <\fBkey\fP> [<\fBchannel\fR>] -+.br -+ -+Sets K_g key to given value. Use \fIplain\fP to specify \fBkey\fR as simple ASCII string. -+Use \fIhex\fP to specify \fBkey\fR as sequence of hexadecimal codes of ASCII charactes. -+I.e. following two examples are equivalent: -+ -+.RS -+ipmitool channel setkg plain PASSWORD -+ -+ipmitool channel setkg hex 50415353574F5244 -+.RE -+ - .RE - .RE - .TP -diff -urNp old/include/ipmitool/helper.h new/include/ipmitool/helper.h ---- old/include/ipmitool/helper.h 2017-02-06 10:20:02.254362909 +0100 -+++ new/include/ipmitool/helper.h 2017-02-06 10:40:07.336136844 +0100 -@@ -58,6 +58,8 @@ - # define IPMI_UID_MAX 63 - #endif - -+#define IPMI_KG_BUFFER_SIZE 21 /* key plus null byte */ -+ - struct ipmi_intf; - - struct valstr { -diff -urNp old/include/ipmitool/ipmi_channel.h new/include/ipmitool/ipmi_channel.h ---- old/include/ipmitool/ipmi_channel.h 2017-02-06 10:20:02.253316684 +0100 -+++ new/include/ipmitool/ipmi_channel.h 2017-02-06 10:58:15.291287621 +0100 -@@ -49,6 +49,10 @@ - #define IPMI_GET_USER_NAME 0x46 - #define IPMI_SET_USER_PASSWORD 0x47 - #define IPMI_GET_CHANNEL_CIPHER_SUITES 0x54 -+#define IPMI_SET_CHANNEL_SECURITY_KEYS 0x56 -+ -+#define IPMI_KG_KEY_ID 1 -+#define IPMI_SET_CHANNEL_SECURITY_KEYS_OP_SET 1 - - /* These are for channel_info_t.session_support */ - #define IPMI_CHANNEL_SESSION_LESS 0x00 -@@ -137,6 +141,40 @@ int _ipmi_set_channel_access(struct ipmi - struct channel_access_t channel_access, uint8_t access_option, - uint8_t privilege_option); - -+struct set_channel_security_keys_req { -+#if WORDS_BIGENDIAN -+ uint8_t __reserved1 :4; -+ uint8_t channel :4; -+ -+ uint8_t __reserved2 :6; -+ uint8_t operation :2; -+ -+ uint8_t key_id; -+ unsigned char key_value[IPMI_KG_BUFFER_SIZE-1]; /* we don't want space for '\0' at the end */ -+#else -+ uint8_t channel :4; -+ uint8_t __reserved1 :4; -+ -+ uint8_t operation :2; -+ uint8_t __reserved2 :6; -+ -+ uint8_t key_id; -+ unsigned char key_value[IPMI_KG_BUFFER_SIZE-1]; /* we don't want space for '\0' at the end */ -+#endif -+} __attribute__ ((packed)); -+ -+struct set_channel_security_keys_rsp { -+#if WORDS_BIGENDIAN -+ uint8_t __reserved1 :6; -+ uint8_t lock_status :2; -+ unsigned char key_value; /* just the first character, use &key_value to explore the rest */ -+#else -+ uint8_t lock_status :2; -+ uint8_t __reserved1 :6; -+ unsigned char key_value; /* just the first character, use &key_value to explore the rest */ -+#endif -+} __attribute__ ((packed)); -+ - uint8_t ipmi_get_channel_medium(struct ipmi_intf * intf, uint8_t channel); - uint8_t ipmi_current_channel_medium(struct ipmi_intf * intf); - int ipmi_channel_main(struct ipmi_intf * intf, int argc, char ** argv); -diff -urNp old/include/ipmitool/ipmi_intf.h new/include/ipmitool/ipmi_intf.h ---- old/include/ipmitool/ipmi_intf.h 2017-02-06 10:20:02.254362909 +0100 -+++ new/include/ipmitool/ipmi_intf.h 2017-02-06 10:40:40.264577602 +0100 -@@ -60,7 +60,6 @@ enum LANPLUS_SESSION_STATE { - - #define IPMI_AUTHCODE_BUFFER_SIZE 20 - #define IPMI_SIK_BUFFER_SIZE IPMI_MAX_MD_SIZE --#define IPMI_KG_BUFFER_SIZE 21 /* key plus null byte */ - - struct ipmi_session_params { - char * hostname; -diff -urNp old/lib/ipmi_channel.c new/lib/ipmi_channel.c ---- old/lib/ipmi_channel.c 2017-02-06 10:20:02.255409134 +0100 -+++ new/lib/ipmi_channel.c 2017-02-06 12:32:14.222282317 +0100 -@@ -821,6 +821,92 @@ ipmi_set_user_access(struct ipmi_intf *i - return 0; - } - -+int -+ipmi_set_channel_security_keys (struct ipmi_intf *intf, uint8_t channel, const char *method, const char *key) -+{ -+ uint8_t kgkey[IPMI_KG_BUFFER_SIZE]; -+ struct ipmi_rs *rsp; -+ struct ipmi_rq req; -+ struct set_channel_security_keys_req req_data; -+ int rc = -1; -+ -+ /* convert provided key to array of bytes */ -+ if (strcmp(method, "hex") == 0) { -+ if (strlen(key) > (IPMI_KG_BUFFER_SIZE-1)*2) { -+ lprintf(LOG_ERR, "Provided key is too long, max. length is %d bytes", (IPMI_KG_BUFFER_SIZE-1)); -+ printf_channel_usage(); -+ return -1; -+ } -+ -+ rc = ipmi_parse_hex(key, kgkey, sizeof(kgkey)-1); -+ if (rc == -1) { -+ lprintf(LOG_ERR, "Number of Kg key characters is not even"); -+ return rc; -+ } else if (rc == -3) { -+ lprintf(LOG_ERR, "Kg key is not hexadecimal number"); -+ return rc; -+ } else if (rc > (IPMI_KG_BUFFER_SIZE-1)) { -+ lprintf(LOG_ERR, "Kg key is too long"); -+ return rc; -+ } -+ -+ } else if (strcmp(method, "plain") == 0) { -+ if (strlen(key) > IPMI_KG_BUFFER_SIZE-1) { -+ lprintf(LOG_ERR, "Provided key is too long, max. length is %d bytes", (IPMI_KG_BUFFER_SIZE -1)); -+ printf_channel_usage(); -+ return rc; -+ } -+ -+ strncpy(kgkey, key, IPMI_KG_BUFFER_SIZE-1); -+ } else { -+ printf_channel_usage(); -+ return rc; -+ } -+ -+ /* assemble and send request to set kg key */ -+ memset(&req_data, 0, sizeof(req_data)); -+ req_data.channel = channel; -+ req_data.operation = IPMI_SET_CHANNEL_SECURITY_KEYS_OP_SET; -+ req_data.key_id = IPMI_KG_KEY_ID; -+ memcpy(req_data.key_value, kgkey, IPMI_KG_BUFFER_SIZE-1); -+ -+ memset(&req, 0, sizeof(req)); -+ req.msg.netfn = IPMI_NETFN_APP; -+ req.msg.cmd = IPMI_SET_CHANNEL_SECURITY_KEYS; -+ req.msg.data = (uint8_t*) &req_data; -+ req.msg.data_len = sizeof(req_data); -+ -+ rsp = intf->sendrecv(intf, &req); -+ if (rsp == NULL) { -+ lprintf(LOG_ERR, "Set Channel Security Keys command failed"); -+ return rc; -+ } -+ if (rsp->ccode > 0) { -+ const char *error = NULL; -+ switch (rsp->ccode) { -+ case 0x80: -+ error = "Key is locked"; -+ break; -+ case 0x81: -+ error = "Insufficient key bytes"; -+ break; -+ case 0x82: -+ error = "Too many key bytes"; -+ break; -+ case 0x83: -+ error = "Key value does not meet criteria for K_g key"; -+ break; -+ default: -+ error = val2str(rsp->ccode, completion_code_vals); -+ } -+ lprintf(LOG_ERR, "Error setting security key: %X (%s)", rsp->ccode, error); -+ return rc; -+ } -+ -+ lprintf(LOG_NOTICE, "Set Channel Security Keys command succeeded"); -+ return 0; -+} -+ - int - ipmi_channel_main(struct ipmi_intf *intf, int argc, char **argv) - { -@@ -890,6 +976,19 @@ ipmi_channel_main(struct ipmi_intf *intf - retval = ipmi_get_channel_cipher_suites(intf, - argv[1], /* ipmi | sol */ - channel); -+ } else if (strncmp(argv[0], "setkg", 5) == 0) { -+ if (argc < 3 || argc > 4) -+ printf_channel_usage(); -+ else { -+ uint8_t ch = 0xe; -+ char *method = argv[1]; -+ char *key = argv[2]; -+ if (argc == 4) { -+ ch = (uint8_t)strtol(argv[3], NULL, 0); -+ } -+ -+ retval = ipmi_set_channel_security_keys(intf, ch, method, key); -+ } - } else { - lprintf(LOG_ERR, "Invalid CHANNEL command: %s\n", argv[0]); - printf_channel_usage(); -@@ -916,6 +1015,10 @@ printf_channel_usage() - lprintf(LOG_NOTICE, - ""); - lprintf(LOG_NOTICE, -+" setkg hex|plain [channel]"); -+ lprintf(LOG_NOTICE, -+""); -+ lprintf(LOG_NOTICE, - "Possible privilege levels are:"); - lprintf(LOG_NOTICE, - " 1 Callback level"); -diff -urNp old/src/plugins/ipmi_intf.c new/src/plugins/ipmi_intf.c ---- old/src/plugins/ipmi_intf.c 2017-02-06 10:20:02.257501584 +0100 -+++ new/src/plugins/ipmi_intf.c 2017-02-06 10:42:12.585257810 +0100 -@@ -55,6 +55,7 @@ - #include - #include - #include -+#include - - #define IPMI_DEFAULT_PAYLOAD_SIZE 25 - diff --git a/system/ipmitool/patches/0004-slowswid.patch b/system/ipmitool/patches/0004-slowswid.patch deleted file mode 100644 index c5f91b7efa..0000000000 --- a/system/ipmitool/patches/0004-slowswid.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c -index fa7b082..9bc5ac2 100644 ---- a/lib/ipmi_sdr.c -+++ b/lib/ipmi_sdr.c -@@ -572,6 +572,8 @@ ipmi_sdr_get_sensor_reading_ipmb(struct ipmi_intf *intf, uint8_t sensor, - uint32_t save_addr; - uint32_t save_channel; - -+ if (target == (uint8_t) 0xb1) -+ return ipmi_sdr_get_sensor_reading(intf, sensor); - if ( BRIDGE_TO_SENSOR(intf, target, channel) ) { - lprintf(LOG_DEBUG, - "Bridge to Sensor " --- -2.1.0 - diff --git a/system/ipmitool/patches/0005-sensor-id-length.patch b/system/ipmitool/patches/0005-sensor-id-length.patch deleted file mode 100644 index 0cb8313d6c..0000000000 --- a/system/ipmitool/patches/0005-sensor-id-length.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/include/ipmitool/ipmi_sdr.h b/include/ipmitool/ipmi_sdr.h -index ccf0cf0..47d3949 100644 ---- a/include/ipmitool/ipmi_sdr.h -+++ b/include/ipmitool/ipmi_sdr.h -@@ -819,7 +819,7 @@ static const char *sensor_type_desc[] __attribute__ ((unused)) = { - "Version Change", "FRU State" }; - - struct sensor_reading { -- char s_id[17]; /* name of the sensor */ -+ char s_id[33]; /* name of the sensor */ - struct sdr_record_full_sensor *full; - struct sdr_record_compact_sensor *compact; - uint8_t s_reading_valid; /* read value valididity */ --- -2.1.0 - diff --git a/system/ipmitool/patches/0006-enable-usb.patch b/system/ipmitool/patches/0006-enable-usb.patch deleted file mode 100644 index d3bfba5a4d..0000000000 --- a/system/ipmitool/patches/0006-enable-usb.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urNp old/configure.ac new/configure.ac ---- old/configure.ac 2017-02-02 14:20:33.230784269 +0100 -+++ new/configure.ac 2017-02-02 14:22:53.528510336 +0100 -@@ -63,7 +63,7 @@ xenable_intf_imb=yes - xenable_intf_lipmi=yes - xenable_intf_open=yes - #xenable_intf_serial=yes --xenable_intf_usb=no -+xenable_intf_usb=yes - xenable_ipmishell=yes - - dnl set some things so we build with GNU tools on Solaris -@@ -209,7 +209,7 @@ fi - dnl enable IPMI USB interface - AC_ARG_ENABLE([intf-usb], - [AC_HELP_STRING([--enable-intf-usb], -- [enable IPMI USB interface [default=auto]])], -+ [enable IPMI USB interface [default=yes]])], - [xenable_intf_usb=$enableval], - [xenable_intf_usb=$xenable_intf_usb]) - if test "x$xenable_intf_usb" = "xstatic" || test "x$xenable_intf_usb" = "xplugin"; then diff --git a/system/ipmitool/patches/0007-check-input.patch b/system/ipmitool/patches/0007-check-input.patch deleted file mode 100644 index 030fd2a40c..0000000000 --- a/system/ipmitool/patches/0007-check-input.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urNp old/doc/ipmitool.1 new/doc/ipmitool.1 ---- old/doc/ipmitool.1 2017-10-03 16:10:50.446539988 +0200 -+++ new/doc/ipmitool.1 2017-10-03 16:16:37.039673239 +0200 -@@ -3170,13 +3170,14 @@ SOL configuration data for the currently - - Enable, disable or show status of SOL payload for the user on the specified channel. - .TP --\fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>] -+\fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>] [\fBnoguard\fR] - .br - - Configure parameters for Serial Over Lan. If no channel is given, - it will display SOL configuration data for the currently used - channel. Configuration parameter updates are automatically guarded --with the updates to the set\-in\-progress parameter. -+with the updates to the set\-in\-progress parameter, unless \fInoguard\fR -+parameter is present. - .RS - .TP - Valid parameters and values are: -diff -urNp old/lib/ipmi_sol.c new/lib/ipmi_sol.c ---- old/lib/ipmi_sol.c 2017-10-03 16:10:50.447539996 +0200 -+++ new/lib/ipmi_sol.c 2017-10-03 16:18:37.079006949 +0200 -@@ -1875,7 +1875,7 @@ static void - print_sol_usage(void) - { - lprintf(LOG_NOTICE, "SOL Commands: info []"); -- lprintf(LOG_NOTICE, " set [channel]"); -+ lprintf(LOG_NOTICE, " set [channel] [noguard]"); - lprintf(LOG_NOTICE, " payload [channel] [userid]"); - lprintf(LOG_NOTICE, " activate [] [instance=]"); - lprintf(LOG_NOTICE, " deactivate [instance=]"); -@@ -1890,6 +1890,8 @@ print_sol_usage(void) - static void - print_sol_set_usage(void) - { -+ lprintf(LOG_NOTICE, "\nSOL set usage: \n"); -+ lprintf(LOG_NOTICE, " sol set [channel] [noguard]\n"); - lprintf(LOG_NOTICE, "\nSOL set parameters and values: \n"); - lprintf(LOG_NOTICE, " set-in-progress set-complete | " - "set-in-progress | commit-write"); diff --git a/system/ipmitool/patches/0008-add-extern.patch b/system/ipmitool/patches/0008-add-extern.patch deleted file mode 100644 index 53f4ca2482..0000000000 --- a/system/ipmitool/patches/0008-add-extern.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 95f666fa10c32233ee202d8b99d05b5e13528a25 Mon Sep 17 00:00:00 2001 -From: Vaclav Dolezal -Date: Thu, 23 Jan 2020 11:26:32 +0100 -Subject: [PATCH] hpmfwupg: move variable definition to .c file - -Signed-off-by: Vaclav Dolezal ---- - include/ipmitool/ipmi_hpmfwupg.h | 2 +- - lib/ipmi_hpmfwupg.c | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h -index de65292..07f597b 100644 ---- a/include/ipmitool/ipmi_hpmfwupg.h -+++ b/include/ipmitool/ipmi_hpmfwupg.h -@@ -800,7 +800,7 @@ typedef struct _VERSIONINFO { - char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; - }VERSIONINFO, *PVERSIONINFO; - --VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; -+extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; - - #define TARGET_VER (0x01) - #define ROLLBACK_VER (0x02) -diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c -index bbcffc0..d7cdcd6 100644 ---- a/lib/ipmi_hpmfwupg.c -+++ b/lib/ipmi_hpmfwupg.c -@@ -58,6 +58,8 @@ ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf); - - extern int verbose; - -+VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; -+ - int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename, - int activate, int, int); - int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx); --- -2.20.1 - diff --git a/system/ipmitool/patches/0009-best-cipher.patch b/system/ipmitool/patches/0009-best-cipher.patch deleted file mode 100644 index 8f999b3295..0000000000 --- a/system/ipmitool/patches/0009-best-cipher.patch +++ /dev/null @@ -1,864 +0,0 @@ -From f2df2aa5a010544d53589a5b048677406eb40ee8 Mon Sep 17 00:00:00 2001 -From: Vernon Mauery -Date: Mon, 9 Apr 2018 12:28:57 -0700 -Subject: [PATCH] lanplus: Auto-select 'best' cipher suite available - -Current cipher suites could be ranked as this: - 17 > 3 >> all the rest - -Cherry-picked-from: 7772254b62826b894ca629df8c597030a98f4f72 -Cherry-picked-from: f9c699c712f884c82fc1a62f1f61a8d597ac0cfd - -Also fetched some functions/macros for helper.h - -Equals to getting include/ipmitool/helper.h changes from commits: -(oldest first) - - 6c00d44 mc: watchdog get: Update to match IPMI 2.0 spec - e8e94d8 mc: watchdog set: Refactor to reduce complexity - 0310208 mc: Code refactor to reduce copy-paste ratio - 249e092 general: Make byteswapping arch-independent - 5491b12 refix 249e0929: Fix byteswapping helpers - bb1a4cc Refactoring. Improve code reuse ratio. ---- - include/ipmitool/helper.h | 58 ++++++++ - include/ipmitool/ipmi_channel.h | 47 +++++++ - include/ipmitool/ipmi_intf.h | 39 ++++- - lib/ipmi_channel.c | 242 +++++++++++++++----------------- - lib/ipmi_main.c | 23 +-- - src/plugins/ipmi_intf.c | 5 +- - src/plugins/lanplus/lanplus.c | 114 +++++++++++---- - 7 files changed, 360 insertions(+), 168 deletions(-) - -diff --git a/include/ipmitool/helper.h b/include/ipmitool/helper.h -index c53736f..6a2e5f4 100644 ---- a/include/ipmitool/helper.h -+++ b/include/ipmitool/helper.h -@@ -38,6 +38,8 @@ - #include - #include - -+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -+ - #ifndef TRUE - #define TRUE 1 - #endif -@@ -111,6 +113,62 @@ FILE * ipmi_open_file(const char * file, int rw); - void ipmi_start_daemon(struct ipmi_intf *intf); - uint16_t ipmi_get_oem_id(struct ipmi_intf *intf); - -+#define IS_SET(v, b) ((v) & (1 << (b))) -+ -+/* le16toh(), hto16le(), et. al. don't exist for Windows or Apple */ -+/* For portability, let's simply define our own versions here */ -+ -+/* IPMI is always little-endian */ -+static inline uint16_t ipmi16toh(void *ipmi16) -+{ -+ uint8_t *ipmi = (uint8_t *)ipmi16; -+ uint16_t h; -+ -+ h = ipmi[1] << 8; /* MSB */ -+ h |= ipmi[0]; /* LSB */ -+ -+ return h; -+} -+ -+static inline void htoipmi16(uint16_t h, uint8_t *ipmi) -+{ -+ ipmi[0] = h & 0xFF; /* LSB */ -+ ipmi[1] = h >> 8; /* MSB */ -+} -+ -+static inline uint32_t ipmi24toh(void *ipmi24) -+{ -+ uint8_t *ipmi = (uint8_t *)ipmi24; -+ uint32_t h = 0; -+ -+ h = ipmi[2] << 16; /* MSB */ -+ h |= ipmi[1] << 8; -+ h |= ipmi[0]; /* LSB */ -+ -+ return h; -+} -+ -+static inline uint32_t ipmi32toh(void *ipmi32) -+{ -+ uint8_t *ipmi = ipmi32; -+ uint32_t h; -+ -+ h = ipmi[3] << 24; /* MSB */ -+ h |= ipmi[2] << 16; -+ h |= ipmi[1] << 8; -+ h |= ipmi[0]; /* LSB */ -+ -+ return h; -+} -+ -+static inline void htoipmi32(uint32_t h, uint8_t *ipmi) -+{ -+ ipmi[0] = h & 0xFF; /* LSB */ -+ ipmi[1] = (h >> 8) & 0xFF; -+ ipmi[2] = (h >> 16) & 0xFF; -+ ipmi[3] = (h >> 24) & 0xFF; /* MSB */ -+} -+ - #define ipmi_open_file_read(file) ipmi_open_file(file, 0) - #define ipmi_open_file_write(file) ipmi_open_file(file, 1) - -diff --git a/include/ipmitool/ipmi_channel.h b/include/ipmitool/ipmi_channel.h -index 3ade2d5..324c0bb 100644 ---- a/include/ipmitool/ipmi_channel.h -+++ b/include/ipmitool/ipmi_channel.h -@@ -37,6 +37,7 @@ - # include - #endif - #include -+#include - - - #define IPMI_GET_CHANNEL_AUTH_CAP 0x38 -@@ -81,6 +82,50 @@ struct channel_access_t { - uint8_t user_level_auth; - }; - -+/* -+ * The Cipher Suite Record Format from table 22-18 of the IPMI v2.0 spec -+ */ -+enum cipher_suite_format_tag { -+ STANDARD_CIPHER_SUITE = 0xc0, -+ OEM_CIPHER_SUITE = 0xc1, -+}; -+#ifdef HAVE_PRAGMA_PACK -+#pragma pack(1) -+#endif -+struct std_cipher_suite_record_t { -+ uint8_t start_of_record; -+ uint8_t cipher_suite_id; -+ uint8_t auth_alg; -+ uint8_t integrity_alg; -+ uint8_t crypt_alg; -+} ATTRIBUTE_PACKING; -+struct oem_cipher_suite_record_t { -+ uint8_t start_of_record; -+ uint8_t cipher_suite_id; -+ uint8_t iana[3]; -+ uint8_t auth_alg; -+ uint8_t integrity_alg; -+ uint8_t crypt_alg; -+} ATTRIBUTE_PACKING; -+#ifdef HAVE_PRAGMA_PACK -+#pragma pack(0) -+#endif -+#define CIPHER_ALG_MASK 0x3f -+#define MAX_CIPHER_SUITE_RECORD_OFFSET 0x40 -+#define MAX_CIPHER_SUITE_DATA_LEN 0x10 -+#define LIST_ALGORITHMS_BY_CIPHER_SUITE 0x80 -+ -+/* Below is the theoretical maximum number of cipher suites that could be -+ * reported by a BMC. That is with the Get Channel Cipher Suites Command, at 16 -+ * bytes at a time and 0x40 requests, it can report 1024 bytes, which is about -+ * 204 standard records or 128 OEM records. Really, we probably don't need more -+ * than about 20, which is the full set of standard records plus a few OEM -+ * records. -+ */ -+#define MAX_CIPHER_SUITE_COUNT (MAX_CIPHER_SUITE_RECORD_OFFSET * \ -+ MAX_CIPHER_SUITE_DATA_LEN / \ -+ sizeof(struct std_cipher_suite_record_t)) -+ - /* - * The Get Authentication Capabilities response structure - * From table 22-15 of the IPMI v2.0 spec -@@ -135,6 +180,8 @@ struct get_channel_auth_cap_rsp { - int _ipmi_get_channel_access(struct ipmi_intf *intf, - struct channel_access_t *channel_access, - uint8_t get_volatile_settings); -+int ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type, -+ uint8_t channel, struct cipher_suite_info *suites, size_t *count); - int _ipmi_get_channel_info(struct ipmi_intf *intf, - struct channel_info_t *channel_info); - int _ipmi_set_channel_access(struct ipmi_intf *intf, -diff --git a/include/ipmitool/ipmi_intf.h b/include/ipmitool/ipmi_intf.h -index 0b8c64b..7a07d66 100644 ---- a/include/ipmitool/ipmi_intf.h -+++ b/include/ipmitool/ipmi_intf.h -@@ -61,13 +61,45 @@ enum LANPLUS_SESSION_STATE { - #define IPMI_AUTHCODE_BUFFER_SIZE 20 - #define IPMI_SIK_BUFFER_SIZE IPMI_MAX_MD_SIZE - -+enum cipher_suite_ids { -+ IPMI_LANPLUS_CIPHER_SUITE_0 = 0, -+ IPMI_LANPLUS_CIPHER_SUITE_1 = 1, -+ IPMI_LANPLUS_CIPHER_SUITE_2 = 2, -+ IPMI_LANPLUS_CIPHER_SUITE_3 = 3, -+ IPMI_LANPLUS_CIPHER_SUITE_4 = 4, -+ IPMI_LANPLUS_CIPHER_SUITE_5 = 5, -+ IPMI_LANPLUS_CIPHER_SUITE_6 = 6, -+ IPMI_LANPLUS_CIPHER_SUITE_7 = 7, -+ IPMI_LANPLUS_CIPHER_SUITE_8 = 8, -+ IPMI_LANPLUS_CIPHER_SUITE_9 = 9, -+ IPMI_LANPLUS_CIPHER_SUITE_10 = 10, -+ IPMI_LANPLUS_CIPHER_SUITE_11 = 11, -+ IPMI_LANPLUS_CIPHER_SUITE_12 = 12, -+ IPMI_LANPLUS_CIPHER_SUITE_13 = 13, -+ IPMI_LANPLUS_CIPHER_SUITE_14 = 14, -+#ifdef HAVE_CRYPTO_SHA256 -+ IPMI_LANPLUS_CIPHER_SUITE_15 = 15, -+ IPMI_LANPLUS_CIPHER_SUITE_16 = 16, -+ IPMI_LANPLUS_CIPHER_SUITE_17 = 17, -+#endif /* HAVE_CRYPTO_SHA256 */ -+ IPMI_LANPLUS_CIPHER_SUITE_RESERVED = 0xff, -+}; -+ -+struct cipher_suite_info { -+ enum cipher_suite_ids cipher_suite_id; -+ uint8_t auth_alg; -+ uint8_t integrity_alg; -+ uint8_t crypt_alg; -+ uint32_t iana; -+}; -+ - struct ipmi_session_params { - char * hostname; - uint8_t username[17]; - uint8_t authcode_set[IPMI_AUTHCODE_BUFFER_SIZE + 1]; - uint8_t authtype_set; - uint8_t privlvl; -- uint8_t cipher_suite_id; -+ enum cipher_suite_ids cipher_suite_id; - char sol_escape_char; - int password; - int port; -@@ -217,7 +249,10 @@ void ipmi_intf_session_set_username(struct ipmi_intf * intf, char * username); - void ipmi_intf_session_set_password(struct ipmi_intf * intf, char * password); - void ipmi_intf_session_set_privlvl(struct ipmi_intf * intf, uint8_t privlvl); - void ipmi_intf_session_set_lookupbit(struct ipmi_intf * intf, uint8_t lookupbit); --void ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf, uint8_t cipher_suite_id); -+#ifdef IPMI_INTF_LANPLUS -+void ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf, -+ enum cipher_suite_ids cipher_suite_id); -+#endif /* IPMI_INTF_LANPLUS */ - void ipmi_intf_session_set_sol_escape_char(struct ipmi_intf * intf, char sol_escape_char); - void ipmi_intf_session_set_kgkey(struct ipmi_intf *intf, const uint8_t *kgkey); - void ipmi_intf_session_set_port(struct ipmi_intf * intf, int port); -diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c -index e1fc75f..3ae3104 100644 ---- a/lib/ipmi_channel.c -+++ b/lib/ipmi_channel.c -@@ -342,86 +342,116 @@ ipmi_get_channel_auth_cap(struct ipmi_intf *intf, uint8_t channel, uint8_t priv) - return 0; - } - --static int -+static size_t -+parse_channel_cipher_suite_data(uint8_t *cipher_suite_data, size_t data_len, -+ struct cipher_suite_info* suites, size_t nr_suites) -+{ -+ size_t count = 0; -+ size_t offset = 0; -+ uint32_t iana; -+ uint8_t auth_alg, integrity_alg, crypt_alg; -+ uint8_t cipher_suite_id; -+ -+ memset(suites, 0, sizeof(*suites) * nr_suites); -+ -+ while (offset < data_len && count < nr_suites) { -+ auth_alg = IPMI_AUTH_RAKP_NONE; -+ integrity_alg = IPMI_INTEGRITY_NONE; -+ crypt_alg = IPMI_CRYPT_NONE; -+ if (cipher_suite_data[offset] == STANDARD_CIPHER_SUITE) { -+ struct std_cipher_suite_record_t *record = -+ (struct std_cipher_suite_record_t*)(&cipher_suite_data[offset]); -+ /* standard type */ -+ iana = 0; -+ -+ /* Verify that we have at least a full record left; id + 3 algs */ -+ if ((data_len - offset) < sizeof(*record)) { -+ lprintf(LOG_INFO, "Incomplete data record in cipher suite data"); -+ break; -+ } -+ cipher_suite_id = record->cipher_suite_id; -+ auth_alg = CIPHER_ALG_MASK & record->auth_alg; -+ integrity_alg = CIPHER_ALG_MASK & record->integrity_alg; -+ crypt_alg = CIPHER_ALG_MASK & record->crypt_alg; -+ offset += sizeof(*record); -+ } else if (cipher_suite_data[offset] == OEM_CIPHER_SUITE) { -+ /* OEM record type */ -+ struct oem_cipher_suite_record_t *record = -+ (struct oem_cipher_suite_record_t*)(&cipher_suite_data[offset]); -+ /* Verify that we have at least a full record left -+ * id + iana + 3 algs -+ */ -+ if ((data_len - offset) < sizeof(*record)) { -+ lprintf(LOG_INFO, "Incomplete data record in cipher suite data"); -+ break; -+ } -+ -+ cipher_suite_id = record->cipher_suite_id; -+ -+ /* Grab the IANA */ -+ iana = ipmi24toh(record->iana); -+ auth_alg = CIPHER_ALG_MASK & record->auth_alg; -+ integrity_alg = CIPHER_ALG_MASK & record->integrity_alg; -+ crypt_alg = CIPHER_ALG_MASK & record->crypt_alg; -+ offset += sizeof(*record); -+ } else { -+ lprintf(LOG_INFO, "Bad start of record byte in cipher suite data (offset %d, value %x)", offset, cipher_suite_data[offset]); -+ break; -+ } -+ suites[count].cipher_suite_id = cipher_suite_id; -+ suites[count].iana = iana; -+ suites[count].auth_alg = auth_alg; -+ suites[count].integrity_alg = integrity_alg; -+ suites[count].crypt_alg = crypt_alg; -+ count++; -+ } -+ return count; -+} -+ -+int - ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type, -- uint8_t channel) -+ uint8_t channel, struct cipher_suite_info *suites, size_t *count) - { - struct ipmi_rs *rsp; - struct ipmi_rq req; - - uint8_t rqdata[3]; -- uint32_t iana; -- uint8_t auth_alg, integrity_alg, crypt_alg; -- uint8_t cipher_suite_id; - uint8_t list_index = 0; - /* 0x40 sets * 16 bytes per set */ -- uint8_t cipher_suite_data[1024]; -- uint16_t offset = 0; -- /* how much was returned, total */ -- uint16_t cipher_suite_data_length = 0; -+ uint8_t cipher_suite_data[MAX_CIPHER_SUITE_RECORD_OFFSET * -+ MAX_CIPHER_SUITE_DATA_LEN]; -+ size_t offset = 0; -+ size_t nr_suites = 0; - -+ if (!suites || !count || !*count) -+ return -1; -+ -+ nr_suites = *count; -+ *count = 0; - memset(cipher_suite_data, 0, sizeof(cipher_suite_data)); -- -+ - memset(&req, 0, sizeof(req)); - req.msg.netfn = IPMI_NETFN_APP; - req.msg.cmd = IPMI_GET_CHANNEL_CIPHER_SUITES; - req.msg.data = rqdata; -- req.msg.data_len = 3; -+ req.msg.data_len = sizeof(rqdata); - - rqdata[0] = channel; - rqdata[1] = ((strncmp(payload_type, "ipmi", 4) == 0)? 0: 1); -- /* Always ask for cipher suite format */ -- rqdata[2] = 0x80; -- -- rsp = intf->sendrecv(intf, &req); -- if (rsp == NULL) { -- lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites"); -- return -1; -- } -- if (rsp->ccode > 0) { -- lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s", -- val2str(rsp->ccode, completion_code_vals)); -- return -1; -- } -- -- -- /* -- * Grab the returned channel number once. We assume it's the same -- * in future calls. -- */ -- if (rsp->data_len >= 1) { -- channel = rsp->data[0]; -- } -- -- while ((rsp->data_len > 1) && (rsp->data_len == 17) && (list_index < 0x3F)) { -- /* -- * We got back cipher suite data -- store it. -- * printf("copying data to offset %d\n", offset); -- * printbuf(rsp->data + 1, rsp->data_len - 1, "this is the data"); -- */ -- memcpy(cipher_suite_data + offset, rsp->data + 1, rsp->data_len - 1); -- offset += rsp->data_len - 1; -- -- /* -- * Increment our list for the next call -- */ -- ++list_index; -- rqdata[2] = (rqdata[2] & 0x80) + list_index; - -+ do { -+ /* Always ask for cipher suite format */ -+ rqdata[2] = LIST_ALGORITHMS_BY_CIPHER_SUITE | list_index; - rsp = intf->sendrecv(intf, &req); - if (rsp == NULL) { - lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites"); - return -1; - } -- if (rsp->ccode > 0) { -+ if (rsp->ccode || rsp->data_len < 1) { - lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s", - val2str(rsp->ccode, completion_code_vals)); - return -1; - } -- } -- -- /* Copy last chunk */ -- if(rsp->data_len > 1) { - /* - * We got back cipher suite data -- store it. - * printf("copying data to offset %d\n", offset); -@@ -429,88 +459,46 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type, - */ - memcpy(cipher_suite_data + offset, rsp->data + 1, rsp->data_len - 1); - offset += rsp->data_len - 1; -- } - -- /* We can chomp on all our data now. */ -- cipher_suite_data_length = offset; -- offset = 0; -+ /* -+ * Increment our list for the next call -+ */ -+ ++list_index; -+ } while ((rsp->data_len == (sizeof(uint8_t) + MAX_CIPHER_SUITE_DATA_LEN)) && -+ (list_index < MAX_CIPHER_SUITE_RECORD_OFFSET)); - -- if (! csv_output) { -- printf("ID IANA Auth Alg Integrity Alg Confidentiality Alg\n"); -- } -- while (offset < cipher_suite_data_length) { -- if (cipher_suite_data[offset++] == 0xC0) { -- /* standard type */ -- iana = 0; -+ *count = parse_channel_cipher_suite_data(cipher_suite_data, offset, suites, -+ nr_suites); -+ return 0; -+} - -- /* Verify that we have at least a full record left; id + 3 algs */ -- if ((cipher_suite_data_length - offset) < 4) { -- lprintf(LOG_ERR, "Incomplete data record in cipher suite data"); -- return -1; -- } -- cipher_suite_id = cipher_suite_data[offset++]; -- } else if (cipher_suite_data[offset++] == 0xC1) { -- /* OEM record type */ -- /* Verify that we have at least a full record left -- * id + iana + 3 algs -- */ -- if ((cipher_suite_data_length - offset) < 4) { -- lprintf(LOG_ERR, "Incomplete data record in cipher suite data"); -- return -1; -- } -+static int -+ipmi_print_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type, -+ uint8_t channel) -+{ -+ int rc; -+ size_t i = 0; -+ struct cipher_suite_info suites[MAX_CIPHER_SUITE_COUNT]; -+ size_t nr_suites = sizeof(*suites); - -- cipher_suite_id = cipher_suite_data[offset++]; -+ rc = ipmi_get_channel_cipher_suites(intf, payload_type, channel, -+ suites, &nr_suites); - -- /* Grab the IANA */ -- iana = -- cipher_suite_data[offset] | -- (cipher_suite_data[offset + 1] << 8) | -- (cipher_suite_data[offset + 2] << 16); -- offset += 3; -- } else { -- lprintf(LOG_ERR, "Bad start of record byte in cipher suite data"); -- return -1; -- } -+ if (rc < 0) -+ return rc; - -- /* -- * Grab the algorithms for this cipher suite. I guess we can't be -- * sure of what order they'll come in. Also, I suppose we default -- * to the NONE algorithm if one were absent. This part of the spec is -- * poorly written -- I have read the errata document. For now, I'm only -- * allowing one algorithm per type (auth, integrity, crypt) because I -- * don't I understand how it could be otherwise. -- */ -- auth_alg = IPMI_AUTH_RAKP_NONE; -- integrity_alg = IPMI_INTEGRITY_NONE; -- crypt_alg = IPMI_CRYPT_NONE; -- -- while (((cipher_suite_data[offset] & 0xC0) != 0xC0) && -- ((cipher_suite_data_length - offset) > 0)) -- { -- switch (cipher_suite_data[offset] & 0xC0) -- { -- case 0x00: -- /* Authentication algorithm specifier */ -- auth_alg = cipher_suite_data[offset++] & 0x3F; -- break; -- case 0x40: -- /* Interity algorithm specifier */ -- integrity_alg = cipher_suite_data[offset++] & 0x3F; -- break; -- case 0x80: -- /* Confidentiality algorithm specifier */ -- crypt_alg = cipher_suite_data[offset++] & 0x3F; -- break; -- } -- } -+ if (! csv_output) { -+ printf("ID IANA Auth Alg Integrity Alg Confidentiality Alg\n"); -+ } -+ for (i = 0; i < nr_suites; i++) { - /* We have everything we need to spit out a cipher suite record */ - printf((csv_output? "%d,%s,%s,%s,%s\n" : - "%-4d %-7s %-15s %-15s %-15s\n"), -- cipher_suite_id, -- iana_string(iana), -- val2str(auth_alg, ipmi_auth_algorithms), -- val2str(integrity_alg, ipmi_integrity_algorithms), -- val2str(crypt_alg, ipmi_encryption_algorithms)); -+ suites[i].cipher_suite_id, -+ iana_string(suites[i].iana), -+ val2str(suites[i].auth_alg, ipmi_auth_algorithms), -+ val2str(suites[i].integrity_alg, ipmi_integrity_algorithms), -+ val2str(suites[i].crypt_alg, ipmi_encryption_algorithms)); - } - return 0; - } -@@ -973,7 +961,7 @@ ipmi_channel_main(struct ipmi_intf *intf, int argc, char **argv) - return (-1); - } - } -- retval = ipmi_get_channel_cipher_suites(intf, -+ retval = ipmi_print_channel_cipher_suites(intf, - argv[1], /* ipmi | sol */ - channel); - } else if (strncmp(argv[0], "setkg", 5) == 0) { -diff --git a/lib/ipmi_main.c b/lib/ipmi_main.c -index 811c80b..6aee102 100644 ---- a/lib/ipmi_main.c -+++ b/lib/ipmi_main.c -@@ -323,6 +323,7 @@ ipmi_main(int argc, char ** argv, - uint8_t target_addr = 0; - uint8_t target_channel = 0; - -+ uint8_t u8tmp = 0; - uint8_t transit_addr = 0; - uint8_t transit_channel = 0; - uint8_t target_lun = 0; -@@ -347,7 +348,10 @@ ipmi_main(int argc, char ** argv, - char * seloem = NULL; - int port = 0; - int devnum = 0; -- int cipher_suite_id = 3; /* See table 22-19 of the IPMIv2 spec */ -+#ifdef IPMI_INTF_LANPLUS -+ /* lookup best cipher suite available */ -+ enum cipher_suite_ids cipher_suite_id = IPMI_LANPLUS_CIPHER_SUITE_RESERVED; -+#endif /* IPMI_INTF_LANPLUS */ - int argflag, i, found; - int rc = -1; - int ai_family = AF_UNSPEC; -@@ -425,19 +429,18 @@ ipmi_main(int argc, char ** argv, - goto out_free; - } - break; -+#ifdef IPMI_INTF_LANPLUS - case 'C': -- if (str2int(optarg, &cipher_suite_id) != 0) { -- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-C'."); -- rc = -1; -- goto out_free; -- } -- /* add check Cipher is -gt 0 */ -- if (cipher_suite_id < 0) { -- lprintf(LOG_ERR, "Cipher suite ID %i is invalid.", cipher_suite_id); -+ /* Cipher Suite ID is a byte as per IPMI specification */ -+ if (str2uchar(optarg, &u8tmp) != 0) { -+ lprintf(LOG_ERR, "Invalid parameter given or out of " -+ "range [0-255] for '-C'."); - rc = -1; - goto out_free; - } -+ cipher_suite_id = u8tmp; - break; -+#endif /* IPMI_INTF_LANPLUS */ - case 'v': - verbose++; - break; -@@ -870,7 +873,9 @@ ipmi_main(int argc, char ** argv, - - ipmi_intf_session_set_lookupbit(ipmi_main_intf, lookupbit); - ipmi_intf_session_set_sol_escape_char(ipmi_main_intf, sol_escape_char); -+#ifdef IPMI_INTF_LANPLUS - ipmi_intf_session_set_cipher_suite_id(ipmi_main_intf, cipher_suite_id); -+#endif /* IPMI_INTF_LANPLUS */ - - ipmi_main_intf->devnum = devnum; - -diff --git a/src/plugins/ipmi_intf.c b/src/plugins/ipmi_intf.c -index 1d9e87b..00b0918 100644 ---- a/src/plugins/ipmi_intf.c -+++ b/src/plugins/ipmi_intf.c -@@ -252,11 +252,14 @@ ipmi_intf_session_set_lookupbit(struct ipmi_intf * intf, uint8_t lookupbit) - intf->ssn_params.lookupbit = lookupbit; - } - -+#ifdef IPMI_INTF_LANPLUS - void --ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf, uint8_t cipher_suite_id) -+ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf, -+ enum cipher_suite_ids cipher_suite_id) - { - intf->ssn_params.cipher_suite_id = cipher_suite_id; - } -+#endif /* IPMI_INTF_LANPLUS */ - - void - ipmi_intf_session_set_sol_escape_char(struct ipmi_intf * intf, char sol_escape_char) -diff --git a/src/plugins/lanplus/lanplus.c b/src/plugins/lanplus/lanplus.c -index a0e388c..3087348 100644 ---- a/src/plugins/lanplus/lanplus.c -+++ b/src/plugins/lanplus/lanplus.c -@@ -164,114 +164,109 @@ extern int verbose; - * returns 0 on success - * 1 on failure - */ --int lanplus_get_requested_ciphers(int cipher_suite_id, -+int lanplus_get_requested_ciphers(enum cipher_suite_ids cipher_suite_id, - uint8_t * auth_alg, - uint8_t * integrity_alg, - uint8_t * crypt_alg) - { --#ifdef HAVE_CRYPTO_SHA256 -- if ((cipher_suite_id < 0) || (cipher_suite_id > 17)) { -- return 1; -- } --#else -- if ((cipher_suite_id < 0) || (cipher_suite_id > 14)) -- return 1; --#endif /* HAVE_CRYPTO_SHA256 */ - /* See table 22-19 for the source of the statement */ - switch (cipher_suite_id) - { -- case 0: -+ case IPMI_LANPLUS_CIPHER_SUITE_0: - *auth_alg = IPMI_AUTH_RAKP_NONE; - *integrity_alg = IPMI_INTEGRITY_NONE; - *crypt_alg = IPMI_CRYPT_NONE; - break; -- case 1: -+ case IPMI_LANPLUS_CIPHER_SUITE_1: - *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA1; - *integrity_alg = IPMI_INTEGRITY_NONE; - *crypt_alg = IPMI_CRYPT_NONE; - break; -- case 2: -+ case IPMI_LANPLUS_CIPHER_SUITE_2: - *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA1; - *integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96; - *crypt_alg = IPMI_CRYPT_NONE; - break; -- case 3: -+ case IPMI_LANPLUS_CIPHER_SUITE_3: - *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA1; - *integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96; - *crypt_alg = IPMI_CRYPT_AES_CBC_128; - break; -- case 4: -+ case IPMI_LANPLUS_CIPHER_SUITE_4: - *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA1; - *integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96; - *crypt_alg = IPMI_CRYPT_XRC4_128; - break; -- case 5: -+ case IPMI_LANPLUS_CIPHER_SUITE_5: - *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA1; - *integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96; - *crypt_alg = IPMI_CRYPT_XRC4_40; - break; -- case 6: -+ case IPMI_LANPLUS_CIPHER_SUITE_6: - *auth_alg = IPMI_AUTH_RAKP_HMAC_MD5; - *integrity_alg = IPMI_INTEGRITY_NONE; - *crypt_alg = IPMI_CRYPT_NONE; - break; -- case 7: -+ case IPMI_LANPLUS_CIPHER_SUITE_7: - *auth_alg = IPMI_AUTH_RAKP_HMAC_MD5; - *integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128; - *crypt_alg = IPMI_CRYPT_NONE; - break; -- case 8: -+ case IPMI_LANPLUS_CIPHER_SUITE_8: - *auth_alg = IPMI_AUTH_RAKP_HMAC_MD5; - *integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128; - *crypt_alg = IPMI_CRYPT_AES_CBC_128; - break; -- case 9: -+ case IPMI_LANPLUS_CIPHER_SUITE_9: - *auth_alg = IPMI_AUTH_RAKP_HMAC_MD5; - *integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128; - *crypt_alg = IPMI_CRYPT_XRC4_128; - break; -- case 10: -+ case IPMI_LANPLUS_CIPHER_SUITE_10: - *auth_alg = IPMI_AUTH_RAKP_HMAC_MD5; - *integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128; - *crypt_alg = IPMI_CRYPT_XRC4_40; - break; -- case 11: -+ case IPMI_LANPLUS_CIPHER_SUITE_11: - *auth_alg = IPMI_AUTH_RAKP_HMAC_MD5; - *integrity_alg = IPMI_INTEGRITY_MD5_128; - *crypt_alg = IPMI_CRYPT_NONE; - break; -- case 12: -+ case IPMI_LANPLUS_CIPHER_SUITE_12: - *auth_alg = IPMI_AUTH_RAKP_HMAC_MD5; - *integrity_alg = IPMI_INTEGRITY_MD5_128; - *crypt_alg = IPMI_CRYPT_AES_CBC_128; - break; -- case 13: -+ case IPMI_LANPLUS_CIPHER_SUITE_13: - *auth_alg = IPMI_AUTH_RAKP_HMAC_MD5; - *integrity_alg = IPMI_INTEGRITY_MD5_128; - *crypt_alg = IPMI_CRYPT_XRC4_128; - break; -- case 14: -+ case IPMI_LANPLUS_CIPHER_SUITE_14: - *auth_alg = IPMI_AUTH_RAKP_HMAC_MD5; - *integrity_alg = IPMI_INTEGRITY_MD5_128; - *crypt_alg = IPMI_CRYPT_XRC4_40; - break; - #ifdef HAVE_CRYPTO_SHA256 -- case 15: -+ case IPMI_LANPLUS_CIPHER_SUITE_15: - *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA256; - *integrity_alg = IPMI_INTEGRITY_NONE; - *crypt_alg = IPMI_CRYPT_NONE; - break; -- case 16: -+ case IPMI_LANPLUS_CIPHER_SUITE_16: - *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA256; - *integrity_alg = IPMI_INTEGRITY_HMAC_SHA256_128; - *crypt_alg = IPMI_CRYPT_NONE; - break; -- case 17: -+ case IPMI_LANPLUS_CIPHER_SUITE_17: - *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA256; - *integrity_alg = IPMI_INTEGRITY_HMAC_SHA256_128; - *crypt_alg = IPMI_CRYPT_AES_CBC_128; - break; - #endif /* HAVE_CRYPTO_SHA256 */ -+ case IPMI_LANPLUS_CIPHER_SUITE_RESERVED: -+ default: -+ return 1; - } - - return 0; -@@ -3441,6 +3436,57 @@ ipmi_set_session_privlvl_cmd(struct ipmi_intf * intf) - return 0; - } - -+static uint8_t -+ipmi_find_best_cipher_suite(struct ipmi_intf *intf) -+{ -+ enum cipher_suite_ids best_suite = IPMI_LANPLUS_CIPHER_SUITE_RESERVED; -+#ifdef HAVE_CRYPTO_SHA256 -+ struct cipher_suite_info suites[MAX_CIPHER_SUITE_COUNT]; -+ size_t nr_suites = ARRAY_SIZE(suites); -+ /* cipher suite best order is chosen with this criteria: -+ * HMAC-MD5 and MD5 are BAD; xRC4 is bad; AES128 is required -+ * HMAC-SHA256 > HMAC-SHA1 -+ * secure authentication > encrypted content -+ * -+ * With xRC4 out, all cipher suites with MD5 out, and cipher suite 3 being -+ * required by the spec, the only better defined standard cipher suite is -+ * 17. So if SHA256 is available, we should try to use that, otherwise, -+ * fall back to 3. -+ */ -+ const enum cipher_suite_ids cipher_order_preferred[] = { -+ IPMI_LANPLUS_CIPHER_SUITE_17, -+ IPMI_LANPLUS_CIPHER_SUITE_3, -+ }; -+ const size_t nr_preferred = ARRAY_SIZE(cipher_order_preferred); -+ size_t ipref, i; -+ -+ if (ipmi_get_channel_cipher_suites(intf, "ipmi", IPMI_LAN_CHANNEL_E, -+ suites, &nr_suites) < 0) -+ { -+ /* default legacy behavior - cipher suite 3 if none is requested */ -+ return IPMI_LANPLUS_CIPHER_SUITE_3; -+ } -+ for (ipref = 0; ipref < nr_preferred && -+ IPMI_LANPLUS_CIPHER_SUITE_RESERVED == best_suite; ipref++) -+ { -+ for (i = 0; i < nr_suites; i++) { -+ if (cipher_order_preferred[ipref] == suites[i].cipher_suite_id) { -+ best_suite = cipher_order_preferred[ipref]; -+ break; -+ } -+ } -+ } -+#endif /* HAVE_CRYPTO_SHA256 */ -+ if (IPMI_LANPLUS_CIPHER_SUITE_RESERVED == best_suite) { -+ /* IPMI 2.0 spec requires that cipher suite 3 is implemented -+ * so we should always be able to fall back to that if better -+ * options are not available. */ -+ best_suite = IPMI_LANPLUS_CIPHER_SUITE_3; -+ } -+ lprintf(LOG_INFO, "Using best available cipher suite %d\n", best_suite); -+ return best_suite; -+} -+ - /** - * ipmi_lanplus_open - */ -@@ -3514,6 +3560,16 @@ ipmi_lanplus_open(struct ipmi_intf * intf) - lprintf(LOG_INFO, "This BMC does not support IPMI v2 / RMCP+"); - goto fail; - } -+ /* -+ * If no cipher suite was provided, query the channel cipher suite list and -+ * pick the best one available -+ */ -+ if (IPMI_LANPLUS_CIPHER_SUITE_RESERVED == -+ intf->ssn_params.cipher_suite_id) -+ { -+ ipmi_intf_session_set_cipher_suite_id(intf, -+ ipmi_find_best_cipher_suite(intf)); -+ } - - /* - * If the open/rakp1/rakp3 sequence encounters a timeout, the whole sequence -@@ -3728,7 +3784,7 @@ static int ipmi_lanplus_setup(struct ipmi_intf * intf) - - static void ipmi_lanp_set_max_rq_data_size(struct ipmi_intf * intf, uint16_t size) - { -- if (intf->ssn_params.cipher_suite_id == 3) { -+ if (intf->ssn_params.cipher_suite_id == IPMI_LANPLUS_CIPHER_SUITE_3) { - /* - * encrypted payload can only be multiple of 16 bytes - */ -@@ -3746,7 +3802,7 @@ static void ipmi_lanp_set_max_rq_data_size(struct ipmi_intf * intf, uint16_t siz - - static void ipmi_lanp_set_max_rp_data_size(struct ipmi_intf * intf, uint16_t size) - { -- if (intf->ssn_params.cipher_suite_id == 3) { -+ if (intf->ssn_params.cipher_suite_id == IPMI_LANPLUS_CIPHER_SUITE_3) { - /* - * encrypted payload can only be multiple of 16 bytes - */ --- -2.20.1 - diff --git a/system/ipmitool/patches/0010-pef-missing-newline.patch b/system/ipmitool/patches/0010-pef-missing-newline.patch deleted file mode 100644 index 76503338d9..0000000000 --- a/system/ipmitool/patches/0010-pef-missing-newline.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f65ea137f0d03f883219a791a49cf8ea7e16776a Mon Sep 17 00:00:00 2001 -From: Vaclav Dolezal -Date: Fri, 1 Mar 2019 14:46:12 +0100 -Subject: [PATCH] Fix "ipmitool pef {status,info}" not printing final newline - -Signed-off-by: Vaclav Dolezal ---- - lib/ipmi_pef.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/ipmi_pef.c b/lib/ipmi_pef.c -index bbf25f2..4be749e 100644 ---- a/lib/ipmi_pef.c -+++ b/lib/ipmi_pef.c -@@ -1183,6 +1183,7 @@ ipmi_pef2_get_info(struct ipmi_intf *intf) - ipmi_pef_print_guid(guid_ptr); - } - ipmi_pef_print_flags(&pef_b2s_actions, P_SUPP, pcap.actions); -+ putchar('\n'); - return 0; - } - -@@ -1242,6 +1243,7 @@ ipmi_pef2_get_status(struct ipmi_intf *intf) - return (-1); - } - ipmi_pef_print_flags(&pef_b2s_actions, P_ACTV, rsp->data[1]); -+ putchar('\n'); - return 0; - } - --- -2.20.1 - diff --git a/system/ipmitool/patches/0011-expand-sensor-name-column.patch b/system/ipmitool/patches/0011-expand-sensor-name-column.patch deleted file mode 100644 index 85e0c92a21..0000000000 --- a/system/ipmitool/patches/0011-expand-sensor-name-column.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 57b57b27fe2c17e3030c41ee5566af36ccd33941 Mon Sep 17 00:00:00 2001 -From: Vaclav Dolezal -Date: Thu, 30 Jan 2020 16:18:37 +0100 -Subject: [PATCH] Expand column with name in ipmitool sdr/sensor output - ---- - lib/ipmi_sdr.c | 4 ++-- - lib/ipmi_sensor.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c -index fd2c02d..0f6faab 100644 ---- a/lib/ipmi_sdr.c -+++ b/lib/ipmi_sdr.c -@@ -1619,7 +1619,7 @@ ipmi_sdr_print_sensor_fc(struct ipmi_intf *intf, - /* - * print sensor name, reading, state - */ -- printf("%-16s | ", sr->s_id); -+ printf("%-24s | ", sr->s_id); - - memset(sval, 0, sizeof (sval)); - -@@ -1657,7 +1657,7 @@ ipmi_sdr_print_sensor_fc(struct ipmi_intf *intf, - /* - * print sensor name, number, state, entity, reading - */ -- printf("%-16s | %02Xh | ", -+ printf("%-24s | %02Xh | ", - sr->s_id, sensor->keys.sensor_num); - - if (IS_THRESHOLD_SENSOR(sensor)) { -diff --git a/lib/ipmi_sensor.c b/lib/ipmi_sensor.c -index a0b7eb8..7328508 100644 ---- a/lib/ipmi_sensor.c -+++ b/lib/ipmi_sensor.c -@@ -175,7 +175,7 @@ ipmi_sensor_print_fc_discrete(struct ipmi_intf *intf, - /* output format - * id value units status thresholds.... - */ -- printf("%-16s ", sr->s_id); -+ printf("%-24s ", sr->s_id); - if (sr->s_reading_valid) { - if (sr->s_has_analog_value) { - /* don't show discrete component */ -@@ -276,7 +276,7 @@ ipmi_sensor_print_fc_threshold(struct ipmi_intf *intf, - /* output format - * id value units status thresholds.... - */ -- printf("%-16s ", sr->s_id); -+ printf("%-24s ", sr->s_id); - if (sr->s_reading_valid) { - if (sr->s_has_analog_value) - printf("| %-10.3f | %-10s | %-6s", --- -2.20.1 - diff --git a/system/ipmitool/patches/0012-CVE-2020-5208.patch b/system/ipmitool/patches/0012-CVE-2020-5208.patch deleted file mode 100644 index 4d5a4874f2..0000000000 --- a/system/ipmitool/patches/0012-CVE-2020-5208.patch +++ /dev/null @@ -1,378 +0,0 @@ -From b3e74778c65ba3ffc8a9b3133c87588ee5d18a74 Mon Sep 17 00:00:00 2001 -From: Chrostoper Ertl -Date: Thu, 28 Nov 2019 16:33:59 +0000 -Subject: [PATCH] Fixes for CVE-2020-5208 - -see https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp - -This patch is combination of following commits: - -pick e824c23316ae50beb7f7488f2055ac65e8b341f2 fru: Fix buffer overflow vulnerabilities -pick 840fb1cbb4fb365cb9797300e3374d4faefcdb10 fru: Fix buffer overflow in ipmi_spd_print_fru -pick 41d7026946fafbd4d1ec0bcaca3ea30a6e8eed22 session: Fix buffer overflow in ipmi_get_session_info -pick 9452be87181a6e83cfcc768b3ed8321763db50e4 channel: Fix buffer overflow -pick d45572d71e70840e0d4c50bf48218492b79c1a10 lanp: Fix buffer overflows in get_lan_param_select -pick 7ccea283dd62a05a320c1921e3d8d71a87772637 fru, sdr: Fix id_string buffer overflows ---- - lib/dimm_spd.c | 9 ++++++++- - lib/ipmi_channel.c | 5 ++++- - lib/ipmi_fru.c | 35 ++++++++++++++++++++++++++++++++--- - lib/ipmi_lanp.c | 14 +++++++------- - lib/ipmi_sdr.c | 40 ++++++++++++++++++++++++---------------- - lib/ipmi_session.c | 12 ++++++++---- - 6 files changed, 83 insertions(+), 32 deletions(-) - -diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c -index 41e30db..68f3b4f 100644 ---- a/lib/dimm_spd.c -+++ b/lib/dimm_spd.c -@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id) - struct ipmi_rq req; - struct fru_info fru; - uint8_t *spd_data, msg_data[4]; -- int len, offset; -+ uint32_t len, offset; - - msg_data[0] = id; - -@@ -1697,6 +1697,13 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id) - } - - len = rsp->data[0]; -+ if(rsp->data_len < 1 -+ || len > rsp->data_len - 1 -+ || len > fru.size - offset) -+ { -+ printf(" Not enough buffer size"); -+ return -1; -+ } - memcpy(&spd_data[offset], rsp->data + 1, len); - offset += len; - } while (offset < fru.size); -diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c -index 3ae3104..80ba522 100644 ---- a/lib/ipmi_channel.c -+++ b/lib/ipmi_channel.c -@@ -447,7 +447,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type, - lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites"); - return -1; - } -- if (rsp->ccode || rsp->data_len < 1) { -+ if (rsp->ccode -+ || rsp->data_len < 1 -+ || rsp->data_len > sizeof(uint8_t) + MAX_CIPHER_SUITE_DATA_LEN) -+ { - lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s", - val2str(rsp->ccode, completion_code_vals)); - return -1; -diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c -index cf00eff..98bc984 100644 ---- a/lib/ipmi_fru.c -+++ b/lib/ipmi_fru.c -@@ -615,7 +615,10 @@ int - read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - uint32_t offset, uint32_t length, uint8_t *frubuf) - { -- uint32_t off = offset, tmp, finish; -+ uint32_t off = offset; -+ uint32_t tmp; -+ uint32_t finish; -+ uint32_t size_left_in_buffer; - struct ipmi_rs * rsp; - struct ipmi_rq req; - uint8_t msg_data[4]; -@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - - finish = offset + length; - if (finish > fru->size) { -+ memset(frubuf + fru->size, 0, length - fru->size); - finish = fru->size; - lprintf(LOG_NOTICE, "Read FRU Area length %d too large, " - "Adjusting to %d", - offset + length, finish - offset); -+ length = finish - offset; - } - - memset(&req, 0, sizeof(req)); -@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - } - } - -+ size_left_in_buffer = length; - do { - tmp = fru->access ? off >> 1 : off; - msg_data[0] = id; -@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - } - - tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0]; -+ if(rsp->data_len < 1 -+ || tmp > rsp->data_len - 1 -+ || tmp > size_left_in_buffer) -+ { -+ printf(" Not enough buffer size"); -+ return -1; -+ } -+ - memcpy(frubuf, rsp->data + 1, tmp); - off += tmp; - frubuf += tmp; -+ size_left_in_buffer -= tmp; - /* sometimes the size returned in the Info command - * is too large. return 0 so higher level function - * still attempts to parse what was returned */ -@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - uint32_t offset, uint32_t length, uint8_t *frubuf) - { - static uint32_t fru_data_rqst_size = 20; -- uint32_t off = offset, tmp, finish; -+ uint32_t off = offset; -+ uint32_t tmp, finish; -+ uint32_t size_left_in_buffer; - struct ipmi_rs * rsp; - struct ipmi_rq req; - uint8_t msg_data[4]; -@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - - finish = offset + length; - if (finish > fru->size) { -+ memset(frubuf + fru->size, 0, length - fru->size); - finish = fru->size; - lprintf(LOG_NOTICE, "Read FRU Area length %d too large, " - "Adjusting to %d", - offset + length, finish - offset); -+ length = finish - offset; - } - - memset(&req, 0, sizeof(req)); -@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - if (fru->access && fru_data_rqst_size > 16) - #endif - fru_data_rqst_size = 16; -+ -+ size_left_in_buffer = length; - do { - tmp = fru->access ? off >> 1 : off; - msg_data[0] = id; -@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - } - - tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0]; -+ if(rsp->data_len < 1 -+ || tmp > rsp->data_len - 1 -+ || tmp > size_left_in_buffer) -+ { -+ printf(" Not enough buffer size"); -+ return -1; -+ } - memcpy((frubuf + off)-offset, rsp->data + 1, tmp); - off += tmp; -+ size_left_in_buffer -= tmp; - - /* sometimes the size returned in the Info command - * is too large. return 0 so higher level function -@@ -3033,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru) - return 0; - - memset(desc, 0, sizeof(desc)); -- memcpy(desc, fru->id_string, fru->id_code & 0x01f); -+ memcpy(desc, fru->id_string, __min(fru->id_code & 0x01f, sizeof(desc))); - desc[fru->id_code & 0x01f] = 0; - printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id); - -diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c -index 65d881b..022c7f1 100644 ---- a/lib/ipmi_lanp.c -+++ b/lib/ipmi_lanp.c -@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - /* set new ipaddr */ - memcpy(data+3, temp, 4); - printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert, -@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - /* set new macaddr */ - memcpy(data+7, temp, 6); - printf("Setting LAN Alert %d MAC Address to " -@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - - if (strncasecmp(argv[1], "def", 3) == 0 || - strncasecmp(argv[1], "default", 7) == 0) { -@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - - if (strncasecmp(argv[1], "on", 2) == 0 || - strncasecmp(argv[1], "yes", 3) == 0) { -@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - - if (strncasecmp(argv[1], "pet", 3) == 0) { - printf("Setting LAN Alert %d destination to PET Trap\n", alert); -@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - - if (str2uchar(argv[1], &data[2]) != 0) { - lprintf(LOG_ERR, "Invalid time: %s", argv[1]); -@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - - if (str2uchar(argv[1], &data[3]) != 0) { - lprintf(LOG_ERR, "Invalid retry: %s", argv[1]); -diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c -index 0f6faab..9890132 100644 ---- a/lib/ipmi_sdr.c -+++ b/lib/ipmi_sdr.c -@@ -2086,7 +2086,7 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf, - return -1; - - memset(desc, 0, sizeof (desc)); -- snprintf(desc, (sensor->id_code & 0x1f) + 1, "%s", sensor->id_string); -+ snprintf(desc, sizeof(desc), "%.*s", (sensor->id_code & 0x1f) + 1, sensor->id_string); - - if (verbose) { - printf("Sensor ID : %s (0x%x)\n", -@@ -2137,7 +2137,7 @@ ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf, - return -1; - - memset(desc, 0, sizeof (desc)); -- snprintf(desc, (mc->id_code & 0x1f) + 1, "%s", mc->id_string); -+ snprintf(desc, sizeof(desc), "%.*s", (mc->id_code & 0x1f) + 1, mc->id_string); - - if (verbose == 0) { - if (csv_output) -@@ -2230,7 +2230,7 @@ ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf, - char desc[17]; - - memset(desc, 0, sizeof (desc)); -- snprintf(desc, (dev->id_code & 0x1f) + 1, "%s", dev->id_string); -+ snprintf(desc, sizeof(desc), "%.*s", (dev->id_code & 0x1f) + 1, dev->id_string); - - if (!verbose) { - if (csv_output) -@@ -2287,7 +2287,7 @@ ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf, - char desc[17]; - - memset(desc, 0, sizeof (desc)); -- snprintf(desc, (fru->id_code & 0x1f) + 1, "%s", fru->id_string); -+ snprintf(desc, sizeof(desc), "%.*s", (fru->id_code & 0x1f) + 1, fru->id_string); - - if (!verbose) { - if (csv_output) -@@ -2491,35 +2491,43 @@ ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf, uint16_t id, - - int rc =0; - char desc[17]; -+ const char *id_string; -+ uint8_t id_code; - memset(desc, ' ', sizeof (desc)); - - switch ( type) { - case SDR_RECORD_TYPE_FULL_SENSOR: - record.full = (struct sdr_record_full_sensor *) raw; -- snprintf(desc, (record.full->id_code & 0x1f) +1, "%s", -- (const char *)record.full->id_string); -+ id_code = record.full->id_code; -+ id_string = record.full->id_string; - break; -+ - case SDR_RECORD_TYPE_COMPACT_SENSOR: - record.compact = (struct sdr_record_compact_sensor *) raw ; -- snprintf(desc, (record.compact->id_code & 0x1f) +1, "%s", -- (const char *)record.compact->id_string); -+ id_code = record.compact->id_code; -+ id_string = record.compact->id_string; - break; -+ - case SDR_RECORD_TYPE_EVENTONLY_SENSOR: - record.eventonly = (struct sdr_record_eventonly_sensor *) raw ; -- snprintf(desc, (record.eventonly->id_code & 0x1f) +1, "%s", -- (const char *)record.eventonly->id_string); -- break; -+ id_code = record.eventonly->id_code; -+ id_string = record.eventonly->id_string; -+ break; -+ - case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR: - record.mcloc = (struct sdr_record_mc_locator *) raw ; -- snprintf(desc, (record.mcloc->id_code & 0x1f) +1, "%s", -- (const char *)record.mcloc->id_string); -+ id_code = record.mcloc->id_code; -+ id_string = record.mcloc->id_string; - break; -+ - default: - rc = -1; -- break; -- } -+ } -+ if (!rc) { -+ snprintf(desc, sizeof(desc), "%.*s", (id_code & 0x1f) + 1, id_string); -+ } - -- lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc); -+ lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc); - return rc; - } - -diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c -index 141f0f4..b9af1fd 100644 ---- a/lib/ipmi_session.c -+++ b/lib/ipmi_session.c -@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf * intf, - } - else - { -- memcpy(&session_info, rsp->data, rsp->data_len); -- print_session_info(&session_info, rsp->data_len); -+ memcpy(&session_info, rsp->data, -+ __min(rsp->data_len, sizeof(session_info))); -+ print_session_info(&session_info, -+ __min(rsp->data_len, sizeof(session_info))); - } - break; - -@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf * intf, - break; - } - -- memcpy(&session_info, rsp->data, rsp->data_len); -- print_session_info(&session_info, rsp->data_len); -+ memcpy(&session_info, rsp->data, -+ __min(rsp->data_len, sizeof(session_info))); -+ print_session_info(&session_info, -+ __min(rsp->data_len, sizeof(session_info))); - - } while (i <= session_info.session_slot_count); - break; --- -2.20.1 - diff --git a/system/jq/README b/system/jq/README deleted file mode 100644 index 26780b8960..0000000000 --- a/system/jq/README +++ /dev/null @@ -1,5 +0,0 @@ -jq is a lightweight and flexible command-line JSON processor. - -jq is like sed for JSON data - you can use it to slice and filter -and map and transform structured data with the same ease that -sed, awk, grep and friends let you play with text. diff --git a/system/jq/jq.SlackBuild b/system/jq/jq.SlackBuild deleted file mode 100644 index d1e8179674..0000000000 --- a/system/jq/jq.SlackBuild +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# Slackware build script for jq - -# Copyright 2015, 2018 Gary Herreman -# Copyright 2024 Isaac Yu -# Copyright 2025 Eugene Wissner, Mannheim, 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=jq -VERSION=${VERSION:-1.8.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --mandir=/usr/man - -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 - -cp -a AUTHORS ChangeLog COPYING NEWS.md README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# Address sbopkglint gripes -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.{la,a} - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/jq/jq.info b/system/jq/jq.info deleted file mode 100644 index 8e3f6ef71b..0000000000 --- a/system/jq/jq.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="jq" -VERSION="1.8.1" -HOMEPAGE="https://jqlang.github.io/jq/" -DOWNLOAD="https://github.com/jqlang/jq/releases/download/jq-1.8.1/jq-1.8.1.tar.gz" -MD5SUM="ea4bb241cd9c625b43b0988776db1e03" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Eugen Wissner" -EMAIL="belka@caraus.de" diff --git a/system/jq/slack-desc b/system/jq/slack-desc deleted file mode 100644 index 0919f74c3f..0000000000 --- a/system/jq/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -jq: jq (command-line JSON processor) -jq: -jq: jq is a lightweight and flexible command-line JSON processor. -jq: -jq: jq is like sed for JSON data - you can use it to slice and filter -jq: and map and transform structured data with the same ease that -jq: sed, awk, grep and friends let you play with text. -jq: -jq: Homepage: https://jqlang.github.io/jq/ -jq: -jq: diff --git a/system/ktsuss/README b/system/ktsuss/README deleted file mode 100644 index 83daa9d71d..0000000000 --- a/system/ktsuss/README +++ /dev/null @@ -1,4 +0,0 @@ -ktsuss stands for "keep the su simple, stupid", and as the name says, -is a graphical version (frontend) of su written in C and GTK+ 2. - -The idea of the project is to remain simple and bug free. diff --git a/system/ktsuss/ktsuss.SlackBuild b/system/ktsuss/ktsuss.SlackBuild deleted file mode 100644 index 70ad2df91c..0000000000 --- a/system/ktsuss/ktsuss.SlackBuild +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/bash - -# Slackware build script for ktsuss - -# Copyright 2008 Murat D. Kadirov -# Copyright 2009,2010 Robby Workman Northport, AL, USA -# Copyright 2012, 2015-2021 Petar Petrov slackalaxy@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. - -# 20240331 bkw: Modified by SlackBuilds.org, BUILD=3: -# - get rid of generic GNU INSTALL in doc dir. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=ktsuss -VERSION=${VERSION:-20140711} # Use date as version -COMMIT=${COMMIT:-99ea19743328a8e72b8b966635e44f1e816cf294} -BUILD=${BUILD:-3} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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-$COMMIT -tar xvf $CWD/$COMMIT.tar.gz || tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz -cd $PRGNAM-$COMMIT -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} + -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 \ - --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 Changelog COPYING CREDITS LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/ktsuss/ktsuss.info b/system/ktsuss/ktsuss.info deleted file mode 100644 index 75944f40f1..0000000000 --- a/system/ktsuss/ktsuss.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ktsuss" -VERSION="20140711" -HOMEPAGE="https://github.com/nomius/ktsuss" -DOWNLOAD="https://github.com/nomius/ktsuss/archive/99ea19743328a8e72b8b966635e44f1e816cf294/ktsuss-99ea19743328a8e72b8b966635e44f1e816cf294.tar.gz" -MD5SUM="edd64e80af42c8fe8207d6dc37a1fab2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Petar Petrov" -EMAIL="slackalaxy@gmail.com" diff --git a/system/ktsuss/slack-desc b/system/ktsuss/slack-desc deleted file mode 100644 index c6a9ee31d5..0000000000 --- a/system/ktsuss/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -ktsuss: ktsuss (keep the su simple, stupid) -ktsuss: -ktsuss: ktsuss is a graphical version of su written in C and GTK+ 2. -ktsuss: -ktsuss: -ktsuss: -ktsuss: -ktsuss: -ktsuss: -ktsuss: -ktsuss: diff --git a/system/lirc/lirc.SlackBuild b/system/lirc/lirc.SlackBuild index d73d5ef824..cd120ae5b7 100644 --- a/system/lirc/lirc.SlackBuild +++ b/system/lirc/lirc.SlackBuild @@ -41,11 +41,13 @@ # /usr/doc/$PRGNAM-$VERSION, instead of /usr/share/doc/$PRGNAM. Also # don't include useless INSTALL in doc dir. +# 20241124 KEC: version 0.10.2. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lirc -VERSION=${VERSION:-0.9.3a} -BUILD=${BUILD:-5} +VERSION=${VERSION:-0.10.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -99,28 +101,6 @@ patch -p1 < $CWD/datarootdir.patch # Thanks to Martin Schmidt for the heads up and the patch patch -p1 < $CWD/gi.patch -# 20220211 bkw: Fix for PyYAML >= 5.1 -sed -i \ - 's|yaml.load(f.read())|yaml.load(f.read(), Loader=yaml.FullLoader)|' \ - tools/check_configs.py \ - tools/lirc-setup/mvc_model.py \ - doc/data2hwdb \ - doc/data2table - -# 20220211 bkw: Source ships with HTML conversions of man pages, but -# make thinks it needs to regenerate them. Touching them doesn't help, -# it always tries to convert them regardless of timestamps. And the -# conversion fails, because our man2html (from man-db) doesn't support -# the -M and -r options. It doesn't stop the Makefile from finishing, -# but all the html pages end up broken/useless. The configure script -# reads an environment variable MAN2HTML, which... does nothing. We -# can't even copy them, let make overwrite them, and restore the -# originals, because 'make install' will regenerate them again. - -# So save the originals, let 'make install' generate and install the -# broken ones, then copy the originals to $PKG/usr/doc afterwards. -cp -a doc/man-html doc/man-html.shipped - MAN2HTML=no \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -139,12 +119,6 @@ make -j1 # doc/Makefile, unless we set it here also. make install-strip DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION -# 20220211 bkw: $PKG/usr/doc now contains a bunch of broken HTML -# files that just contain the usage message for man2html. Replace them -# with pre-generated files upstream ships. Why does this have to be -# so complex? -cp -a doc/man-html.shipped/*.html $PKG/usr/doc/$PRGNAM-$VERSION/lirc.org/html - gzip -9 $PKG/usr/man/man*/* # 20220211 bkw: not sure if the .la files in /usr/lib(64?)/lirc/plugins @@ -153,17 +127,17 @@ gzip -9 $PKG/usr/man/man*/* rm -f $PKG/usr/lib*/*.la mkdir -p $PKG/lib/udev/rules.d -cat contrib/lirc.rules > $PKG/lib/udev/rules.d/96-lirc.rules +cat contrib/60-lirc.rules > $PKG/lib/udev/rules.d/60-lirc.rules mkdir -p $PKG/etc/logrotate.d cat contrib/lircd.conf > $PKG/etc/lircd.conf.new cat contrib/lircmd.conf > $PKG/etc/lircmd.conf.new -cat contrib/lircrc > $PKG/etc/lircrc.new +# KEC: This might not be the right file to use. +cat contrib/lircrc/lircrc > $PKG/etc/lircrc.new cat $CWD/lirc.logrotate > $PKG/etc/logrotate.d/lirc.new PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION -# HTML docs are already installed in $PKGDOC/html cp -a AUTHORS COPYING ChangeLog NEWS README doc/irxevent.keys $PKGDOC cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild diff --git a/system/lirc/lirc.info b/system/lirc/lirc.info index 41a9697d3b..ca79b5a407 100644 --- a/system/lirc/lirc.info +++ b/system/lirc/lirc.info @@ -1,8 +1,8 @@ PRGNAM="lirc" -VERSION="0.9.3a" +VERSION="0.10.2" HOMEPAGE="http://www.lirc.org/" -DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.9.3a/lirc-0.9.3a.tar.bz2" -MD5SUM="f9ed5dd0684a52c7cd98672e71e81b05" +DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.10.2/lirc-0.10.2.tar.bz2" +MD5SUM="cb96cfb0af8067c0062e2f5a100f426a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/mongodb/mongodb.SlackBuild b/system/mongodb/mongodb.SlackBuild index 0f851695d0..9409565527 100644 --- a/system/mongodb/mongodb.SlackBuild +++ b/system/mongodb/mongodb.SlackBuild @@ -73,8 +73,8 @@ getent group mongo &>/dev/null || bailout rm -fr $PKG mkdir -p $TMP $PKG $OUTPUT cd $PKG -ar p $CWD/mongodb-org-server_${VERSION}_amd64.deb data.tar.xz | tar xJv -ar p $CWD/mongodb-org-mongos_${VERSION}_amd64.deb data.tar.xz | tar xJv +ar p $CWD/mongodb-org-server_${VERSION}_amd64.deb data.tar.xz | unzstd | tar xv +ar p $CWD/mongodb-org-mongos_${VERSION}_amd64.deb data.tar.xz | unzstd | tar xv chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/system/mongodb/mongodb.info b/system/mongodb/mongodb.info index a78d8d4308..97a6aa53d3 100644 --- a/system/mongodb/mongodb.info +++ b/system/mongodb/mongodb.info @@ -3,10 +3,10 @@ VERSION="8.2.0" HOMEPAGE="https://www.mongodb.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/8.2/multiverse/binary-amd64/mongodb-org-server_8.2.0_amd64.deb \ - https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/8.2/multiverse/binary-amd64/mongodb-org-mongos_8.2.0_amd64.deb" -MD5SUM_x86_64="ff2de8495d377d9666a170086d97f519 \ - 93552a73680550453e7970481cee0802" +DOWNLOAD_x86_64="https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/8.2/multiverse/binary-amd64/mongodb-org-server_8.2.0_amd64.deb \ + https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/8.2/multiverse/binary-amd64/mongodb-org-mongos_8.2.0_amd64.deb" +MD5SUM_x86_64="d3cb108219c617f429ae47785e339174 \ + 9587ae9cb12a5402c3af1c9044cb54ca" REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/system/noto-emoji/README b/system/noto-emoji/README deleted file mode 100644 index 098ab35df8..0000000000 --- a/system/noto-emoji/README +++ /dev/null @@ -1 +0,0 @@ -noto-emoji - Color Noto emoji fonts diff --git a/system/noto-emoji/doinst.sh b/system/noto-emoji/doinst.sh deleted file mode 100644 index 8fec9f5340..0000000000 --- a/system/noto-emoji/doinst.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Update the X font indexes: -if [ -x /usr/bin/mkfontdir ]; then - ( cd /usr/share/fonts/TTF - mkfontscale . - mkfontdir . - ) -fi - -if [ -x /usr/bin/fc-cache ]; then - /usr/bin/fc-cache -f -fi diff --git a/system/noto-emoji/noto-emoji.SlackBuild b/system/noto-emoji/noto-emoji.SlackBuild deleted file mode 100644 index 07702d6e23..0000000000 --- a/system/noto-emoji/noto-emoji.SlackBuild +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash - -# Slackware build script for noto-emoji - -# Copyright 2017-2020,2022 Andrew Clemons, Wellington New Zealand -# Copyright 2022-2025 Andrew Clemons, Tokyo Japan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=noto-emoji -VERSION=${VERSION:-2.051} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -ARCH=noarch - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -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 {} \; - -install -d $PKG/usr/share/fonts/TTF/ -install -m644 fonts/NotoColorEmoji.ttf $PKG/usr/share/fonts/TTF/ - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/noto-emoji/noto-emoji.info b/system/noto-emoji/noto-emoji.info deleted file mode 100644 index a91cee4d36..0000000000 --- a/system/noto-emoji/noto-emoji.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="noto-emoji" -VERSION="2.051" -HOMEPAGE="https://www.google.com/get/noto/help/emoji/" -DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2.051/noto-emoji-2.051.tar.gz" -MD5SUM="27186c339334f6f77017594c2ce47106" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andrew Clemons" -EMAIL="andrew.clemons@gmail.com" diff --git a/system/noto-emoji/slack-desc b/system/noto-emoji/slack-desc deleted file mode 100644 index 21a7abd353..0000000000 --- a/system/noto-emoji/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -noto-emoji: noto-emoji (Noto Emoji fonts) -noto-emoji: -noto-emoji: Color Noto emoji fonts, and tools for working with them. -noto-emoji: -noto-emoji: https://github.com/googlei18n/noto-emoji -noto-emoji: -noto-emoji: -noto-emoji: -noto-emoji: -noto-emoji: -noto-emoji: diff --git a/system/nut/README b/system/nut/README deleted file mode 100644 index bf5ba069e1..0000000000 --- a/system/nut/README +++ /dev/null @@ -1,8 +0,0 @@ -The Network UPS Tools is a collection of programs which provide a -common interface for monitoring and administering UPS hardware. It -uses a layered apporoach to connect all the components. Drivers are -provided for a wide assortment of equipment. The primary goal of the -NUT project is to provide reliable monitoring of UPS hardware and -ensure safe shutdowns of the systems which are connected. - -See README.SLACKWARE for configuration hints. diff --git a/system/nut/README.SLACKWARE b/system/nut/README.SLACKWARE deleted file mode 100644 index a73275956c..0000000000 --- a/system/nut/README.SLACKWARE +++ /dev/null @@ -1,43 +0,0 @@ -README.SLACKWARE -Written by V'yacheslav Stetskevych - -In order to configure Network UPS tools on Slackware you need to rename -or make copies of the sample config files in /etc/nut and edit them -to suit your needs. See documentation in /usr/doc/nut-* for reference. -As you make your new config files, don't forget to secure them: - chown root:nut /etc/nut/*.conf /etc/nut/*.users - chmod 640 /etc/nut/*.conf /etc/nut/*.users - -If you are using a serial-connected UPS, be sure to add the nut user to -the 'dialout' group: - usermod -a -G dialout nut - -A startup script /etc/rc.d/rc.ups is provided with this build. -You can add these lines to /etc/rc.d/rc.local to launch it on system start: - if [ -x /etc/rc.d/rc.ups ]; then - /etc/rc.d/rc.ups start - fi - -If you have more than one box sitting on the same UPS, you should only use -'start' on the one box that is connected to the device using a signal cable. -On the other boxes, start rc.ups with the 'start_upsmon' parameter to only -monitor the power status (client mode). Configure access permissions on the -server box accordingly. - -If you wish for your UPS to turn off it's power during an extended power outage -in order not to drain it's battery completely, you should make two simple edits -to the Slackware shutdown script /etc/rc.d/rc.6 near the end of it. -These are only needed on the server box, one that is connected to the UPS: -1) Insert after the rootfs has been remounted read-only: - if [ -x /usr/libexec/nut/nut_restart_udev ]; then - . /usr/libexec/nut/nut_restart_udev - fi -2) Insert after the genpowerd block and before the actual halt: - if [ -x /usr/libexec/nut/nut_kill_inverter ]; then - . /usr/libexec/nut/nut_kill_inverter - fi - -Don't forget to set your motherboard BIOS to automatically turn the machine on -when the power comes back. - -Have fun! diff --git a/system/nut/doinst.sh b/system/nut/doinst.sh deleted file mode 100644 index ea64d25add..0000000000 --- a/system/nut/doinst.sh +++ /dev/null @@ -1,21 +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.ups.new: -if [ -e etc/rc.d/rc.ups ]; then - cp -a etc/rc.d/rc.ups etc/rc.d/rc.ups.new.incoming - cat etc/rc.d/rc.ups.new > etc/rc.d/rc.ups.new.incoming - mv etc/rc.d/rc.ups.new.incoming etc/rc.d/rc.ups.new -fi - -config etc/rc.d/rc.ups.new diff --git a/system/nut/nut.SlackBuild b/system/nut/nut.SlackBuild deleted file mode 100644 index d4b19e36ee..0000000000 --- a/system/nut/nut.SlackBuild +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/bash - -# Slackware build script for nut (Network UPS Tools) - -# Copyright 2010 V'yacheslav Stetskevych -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=nut -VERSION=${VERSION:-2.7.4} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -NUTUSER=${NUTUSER:-nut} -NUTGROUP=${NUTGROUP:-nut} - -# The user and group accounts have to be created manually. -# For slackbuilds.org, assigned nut uid/gid are 218/218. -# See http://slackbuilds.org/uid_gid.txt -if ! grep -q ^$NUTGROUP: /etc/group; then - echo " You must have a \"$NUTGROUP\" group to run this script." - echo " # groupadd -g 218 $NUTGROUP" - exit 1 -elif ! grep -q ^$NUTUSER: /etc/passwd; then - echo " You must have a \"$NUTUSER\" user to run this script." - echo " # useradd -u 218 -g $NUTGROUP -s /bin/false $NUTUSER" - exit 1 -fi - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 -std=c++14" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/$PRGNAM \ - --localstatedir=/var \ - --datadir=/usr/share/nut \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --enable-strip \ - --disable-static \ - --with-dev \ - --with-serial \ - --with-usb \ - --with-snmp \ - --with-neon \ - --with-wrap \ - --with-cgi\ - --with-cgipath=/var/www/cgi-bin/nut \ - --with-htmlpath=/var/www/htdocs/ups \ - --with-drvpath=/usr/libexec/nut \ - --with-statepath=/var/run/nut \ - --with-pidpath=/var/run/nut \ - --with-altpidpath=/var/run/nut \ - --with-user=nut \ - --with-group=nut -make -make install DESTDIR=$PKG - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -# Install the bash_completion script -install -d $PKG/usr/share/bash-completion/completions -install -m 755 scripts/misc/nut.bash_completion $PKG/usr/share/bash-completion/completions/nut - -# Install the startup script -install -d $PKG/etc/rc.d -install -m 644 $CWD/rc.ups $PKG/etc/rc.d/rc.ups.new - -# Create the state and run dirs -install -d -o root -g $NUTGROUP -m 770 $PKG/var/state/ups -install -d -o $NUTUSER -g $NUTGROUP -m 770 $PKG/var/run/nut - -# Install shutdown helper files -install -m 755 $CWD/nut_restart_udev $CWD/nut_kill_inverter $PKG/usr/libexec/nut - -# Install documentation -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -ar docs \ - AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING \ - $PKG/usr/doc/$PRGNAM-$VERSION -rm $PKG/usr/doc/$PRGNAM-$VERSION/docs/Makefile* -cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -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 diff --git a/system/nut/nut.info b/system/nut/nut.info deleted file mode 100644 index b6e4db3b0c..0000000000 --- a/system/nut/nut.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nut" -VERSION="2.7.4" -HOMEPAGE="http://www.networkupstools.org/" -DOWNLOAD="http://www.networkupstools.org/source/2.7/nut-2.7.4.tar.gz" -MD5SUM="3ba53656933d7471f95140b32a5b8d5c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="V'yacheslav Stetskevych" -EMAIL="slava18@gmail.com" diff --git a/system/nut/nut_kill_inverter b/system/nut/nut_kill_inverter deleted file mode 100644 index 251a047df7..0000000000 --- a/system/nut/nut_kill_inverter +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# This file is part of Network UPS Tools build for Slackware Linux. -# It should be sourced in /etc/rc.d/rc.0 as part of the poweroff sequence. -# Here, we signal the UPS to shut off the power. -# Reference: http://www.mail-archive.com/nut-upsdev@lists.alioth.debian.org/msg01099.html -# To be sourced after the genpowerd block and before the actual halt. - -if [ -f /etc/killpower ]; then - echo "----------------------------------------Shutting down UPS power!" - /etc/rc.d/rc.ups shutdown - sleep 40 - echo "The UPS was not shut off properly, or the power came back in the" - echo "middle of the shutdown process, or USB communication failed." - sleep 10 -fi diff --git a/system/nut/nut_restart_udev b/system/nut/nut_restart_udev deleted file mode 100644 index d289c0f87a..0000000000 --- a/system/nut/nut_restart_udev +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# This file is part of Network UPS Tools build for Slackware Linux. -# It should be sourced in /etc/rc.d/rc.0 as part of the poweroff sequence. -# Here, we restart udev so that the system is able to kill off the UPS inverter. -# Reference: http://www.mail-archive.com/nut-upsdev@lists.alioth.debian.org/msg01099.html -# To be sourced after the rootfs has been remounted read-only. - -if [ -f /etc/killpower ]; then -echo "Restarting udev to be able to shut the UPS inverter off..." -/etc/rc.d/rc.udev start -sleep 10 -fi diff --git a/system/nut/rc.ups b/system/nut/rc.ups deleted file mode 100644 index 37916951bd..0000000000 --- a/system/nut/rc.ups +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# Slackware startup script for Network UPS Tools -# Copyright 2010 V'yacheslav Stetskevych - -# UPS drivers live here -DRIVERPATH=/usr/libexec/nut -export PATH=$DRIVERPATH:$PATH - -POWERDOWNFLAG=/etc/killpower -NUTUSER=nut -NUTGROUP=nut -UPSDCONF=/etc/ups/upsd.conf -UPSCONF=/etc/ups/ups.conf -UPSMONCONF=/etc/ups/upsmon.conf - -# Check for existense of the nut user and group -# For slackbuilds.org, assigned nut uid/gid are 218/218. -# See http://slackbuilds.org/uid_gid.txt -if ! grep -q ^$NUTGROUP: /etc/group; then - echo " You must have a \"$NUTGROUP\" group to run this script." - echo " # groupadd -g 218 $NUTGROUP" - exit 1 -elif ! grep -q ^$NUTUSER: /etc/passwd; then - echo " You must have a \"$NUTUSER\" user to run this script." - echo " # useradd -u 218 -g $NUTGROUP -s /bin/false $NUTUSER" - exit 1 -fi - -start_driver() { - upsdrvctl -u $NUTUSER start || exit 1 -} - -start_upsd() { - upsd -u $NUTUSER || exit 1 -} - -start_upsmon() { - upsmon -u $NUTUSER || exit 1 -} - -stop() { - echo "Stopping the UPS services... " - if pgrep upsd 2>&1 >/dev/null; then - upsd -c stop; fi - if pgrep upsmon 2>&1 >/dev/null; then - upsmon -c stop; fi - upsdrvctl stop -} - -case "$1" in - start) # starts everything (for a ups server box) - mkdir -p /var/run/nut - chown $NUTUSER:$NUTGROUP /var/run/nut - chmod 0770 /var/run/nut - start_driver - start_upsd - start_upsmon - ;; - start_upsmon) # starts upsmon only (for a ups client box) - start_upsmon - ;; - stop) # stops all UPS-related daemons - stop - ;; - shutdown) # shuts down the UPS - echo "Killing inverter..." - upsdrvctl shutdown - ;; - reload) - echo "Reloading config files..." - upsd -c reload - upsmon -c reload - ;; - *) - echo "Usage: $0 {start|start_upsmon|stop|shutdown|reload}" -esac diff --git a/system/nut/slack-desc b/system/nut/slack-desc deleted file mode 100644 index c4c8a99c23..0000000000 --- a/system/nut/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nut: nut (Network UPS Tools) -nut: -nut: The Network UPS Tools is a collection of programs which provide a -nut: common interface for monitoring and administering UPS hardware. -nut: It uses a layered apporoach to connect all the components. Drivers -nut: are provided for a wide assortment of equipment. The primary goal of -nut: the NUT project is to provide reliable monitoring of UPS hardware -nut: and ensure safe shutdowns of the systems which are connected. -nut: -nut: Homepage: http://www.networkupstools.org -nut: diff --git a/system/nvidia-firmware/nvidia-firmware.info b/system/nvidia-firmware/nvidia-firmware.info index 2e848a4635..8baf78ae7a 100644 --- a/system/nvidia-firmware/nvidia-firmware.info +++ b/system/nvidia-firmware/nvidia-firmware.info @@ -2,11 +2,11 @@ PRGNAM="nvidia-firmware" VERSION="325.15" HOMEPAGE="https://wiki.freedesktop.org/nouveau/VideoAcceleration/" DOWNLOAD="http://us.download.nvidia.com/XFree86/Linux-x86/325.15/NVIDIA-Linux-x86-325.15.run \ - https://raw.githubusercontent.com/imirkin/re-vp2/d19d818d1e05c7c68afb052073cc8a487cac8f5d/extract_firmware.py" + https://raw.githubusercontent.com/envytools/firmware/a0b9f9be0efad90cc84b8b2eaf587c3d7d350ea9/extract_firmware.py" MD5SUM="528fc538584de6446384b9cec3099d6c \ - 7975d50a07d9cd9131dba60aef32a86f" + 28201eabeb26046a91eb31338cfc72b1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" +MAINTAINER="nobody" +EMAIL="nobody@nowhere" diff --git a/system/open-vm-tools/751.patch b/system/open-vm-tools/751.patch new file mode 100644 index 0000000000..4529fca8dc --- /dev/null +++ b/system/open-vm-tools/751.patch @@ -0,0 +1,23 @@ +From 129d87bd5fd5f2436a467d4b7d43e0d102a867da Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Wed, 20 Nov 2024 10:40:03 +1100 +Subject: [PATCH] Fix build when compiling with -std=c23 + +Fixes the build when using gcc 15 +--- + open-vm-tools/lib/lock/ul.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c +index d376a98af..fc9fdb714 100644 +--- a/open-vm-tools/lib/lock/ul.c ++++ b/open-vm-tools/lib/lock/ul.c +@@ -29,7 +29,7 @@ + static Bool mxInPanic = FALSE; // track when involved in a panic + static Bool mxUserCollectLockingTree = FALSE; + +-Bool (*MXUserTryAcquireForceFail)() = NULL; ++Bool (*MXUserTryAcquireForceFail)(const char *) = NULL; + + static MX_Rank (*MXUserMxCheckRank)(void) = NULL; + static void (*MXUserMxLockLister)(void) = NULL; diff --git a/system/open-vm-tools/open-vm-tools.SlackBuild b/system/open-vm-tools/open-vm-tools.SlackBuild index ad8e9e3d13..6d4c34ef0e 100644 --- a/system/open-vm-tools/open-vm-tools.SlackBuild +++ b/system/open-vm-tools/open-vm-tools.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=open-vm-tools -VERSION=${VERSION:-11.3.5_18557794} # Remember to change VERSION - to _ !!! -BUILD=${BUILD:-2} +VERSION=${VERSION:-12.5.2_24697584} # Remember to change VERSION - to _ !!! +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -99,7 +96,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sed -i "s|\ -Werror||" configure.ac +sed -i "s|\ -Werror||" configure.ac || exit 1 + +patch -p2 < $CWD/751.patch autoreconf -i CFLAGS="$SLKCFLAGS" \ diff --git a/system/open-vm-tools/open-vm-tools.info b/system/open-vm-tools/open-vm-tools.info index e79e276500..a870a19837 100644 --- a/system/open-vm-tools/open-vm-tools.info +++ b/system/open-vm-tools/open-vm-tools.info @@ -1,8 +1,8 @@ PRGNAM="open-vm-tools" -VERSION="11.3.5_18557794" +VERSION="12.5.2_24697584" HOMEPAGE="https://github.com/vmware/open-vm-tools" -DOWNLOAD="https://github.com/vmware/open-vm-tools/releases/download/stable-11.3.5/open-vm-tools-11.3.5-18557794.tar.gz" -MD5SUM="5ee21a56d5fd7a1838f41e328c061084" +DOWNLOAD="https://github.com/vmware/open-vm-tools/releases/download/stable-12.5.2/open-vm-tools-12.5.2-24697584.tar.gz" +MD5SUM="4c5bad8e6bd0b75467c312034678b9de" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libmspack libdnet" diff --git a/system/opensc/README b/system/opensc/README deleted file mode 100644 index 4eee6ffb1f..0000000000 --- a/system/opensc/README +++ /dev/null @@ -1,23 +0,0 @@ -SmartCard utilities/libraries for PKCS#11/15 compatible cards - -This package provides a set of libraries and utilities to access -smart cards. Its main focus is on cards that support cryptographic -operations, and facilitate their use in security applications such -as mail encryption, authentication, and digital signature. OpenSC -implements the PKCS#11 API so applications supporting this API such -as Mozilla Firefox and Thunderbird can use it. OpenSC implements the -PKCS#15 standard and aims to be compatible with every software that -does so, too. - -You may need to edit /etc/opensc.conf in order to use a particular -backend and smartcard. - -Beware! Smartcards have usually a limited number of times you may try a -wrong PIN/PUK combination before they become inoperable/permanently -blocked. You have been warned! - -Since version 0.12.0, only one reader subsystem can be used and -compiled in at the same time. The PCSC-LITE subsystem is used by -default and it is suitable for most smartcards. If you need the -OPENCT subsystem instead, you have to pass "OPENCT=1" to the script -when building and have the optional dependency openct installed. diff --git a/system/opensc/doinst.sh b/system/opensc/doinst.sh deleted file mode 100644 index 6d8bb11040..0000000000 --- a/system/opensc/doinst.sh +++ /dev/null @@ -1,18 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/opensc.conf.new - -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/system/opensc/opensc.SlackBuild b/system/opensc/opensc.SlackBuild deleted file mode 100644 index 8c5a363c4c..0000000000 --- a/system/opensc/opensc.SlackBuild +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash - -# Slackware build script for opensc - -# Copyright 2008-2015 LukenShiro, Italy -# Copyright 2018-2023 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. - -# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2: -# - add update-desktop-database to doinst.sh. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=opensc -VERSION=${VERSION:-0.23.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -DOCFILES="README COPYING NEWS" -XSL_STYLESHEETS_VER=$(export LS_OPTIONS='' ; ls -1 /usr/share/xml/docbook/ | grep xsl-stylesheets- | cut -d- -f3) - -# opensc now supports only one reader subsystem (pcsc-lite or openct) -OPENCT=${OPENCT:-0} # pcsc-lite is the default, openct disabled - -case "$OPENCT" in - 0) RDRSUBSYS_flags="--enable-pcsc --disable-openct" ;; - *) RDRSUBSYS_flags="--disable-pcsc --enable-openct" ;; -esac - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 {} \+ - -# --enable-nsplugin and --with-pinentry= are no longer supported. -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --datarootdir=/usr/share \ - --mandir=/usr/man \ - --enable-doc \ - --with-xsl-stylesheetsdir=/usr/share/xml/docbook/xsl-stylesheets-${XSL_STYLESHEETS_VER} \ - $RDRSUBSYS_flags \ - --enable-sm \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG -gzip -9 $PKG/usr/man/man*/* -rm -f $PKG/usr/lib*/*.la - -# Don't clobber the config file -mv $PKG/etc/opensc.conf $PKG/etc/opensc.conf.new - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/ -cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$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 diff --git a/system/opensc/opensc.info b/system/opensc/opensc.info deleted file mode 100644 index 071b30104b..0000000000 --- a/system/opensc/opensc.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="opensc" -VERSION="0.23.0" -HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki/" -DOWNLOAD="https://github.com/OpenSC/OpenSC/releases/download/0.23.0/opensc-0.23.0.tar.gz" -MD5SUM="35c599e673ae9205550974e2dcbe0825" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="pcsc-lite" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/system/opensc/slack-desc b/system/opensc/slack-desc deleted file mode 100644 index ada9f73a81..0000000000 --- a/system/opensc/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -opensc: opensc (SmartCard utilities/libraries for PKCS#11/15 compatible cards) -opensc: -opensc: It provides a set of libraries and utilities to access smart -opensc: cards. Its main focus is on cards that support cryptographic -opensc: operations, and facilitate their use in security applications such -opensc: as mail encryption, authentication, and digital signature. OpenSC -opensc: implements the PKCS#11 API so applications supporting this API such -opensc: as Mozilla Firefox and Thunderbird can use it. OpenSC implements -opensc: the PKCS#15 standard and aims to be compatible with every software -opensc: that does so, too. -opensc: Homepage: http://www.opensc-project.org/opensc/ diff --git a/system/ostree/ostree.SlackBuild b/system/ostree/ostree.SlackBuild index 330fae47c2..c510ecc9cc 100644 --- a/system/ostree/ostree.SlackBuild +++ b/system/ostree/ostree.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ostree -VERSION=${VERSION:-2021.3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2025.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -89,6 +89,12 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --without-libsystemd \ + --with-curl \ + --with-ed25519-libsodium \ + --with-grub2-mkconfig-path=/usr/sbin/grub-mkconfig \ + --with-modern-grub \ --build=$ARCH-slackware-linux make diff --git a/system/ostree/ostree.info b/system/ostree/ostree.info index 7dd9ee41b0..904b9435c7 100644 --- a/system/ostree/ostree.info +++ b/system/ostree/ostree.info @@ -1,8 +1,8 @@ PRGNAM="ostree" -VERSION="2021.3" +VERSION="2025.2" HOMEPAGE="https://github.com/ostreedev/ostree/" -DOWNLOAD="https://github.com/ostreedev/ostree/releases/download/v2021.3/libostree-2021.3.tar.xz" -MD5SUM="a70520dc37d9fdc655a7ff76892496fe" +DOWNLOAD="https://github.com/ostreedev/ostree/releases/download/v2025.2/libostree-2025.2.tar.xz" +MD5SUM="dc5346ab549b51ea1765514ca6874677" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/passwordsafe/passwordsafe.SlackBuild b/system/passwordsafe/passwordsafe.SlackBuild index c4c43f353f..956902ec00 100644 --- a/system/passwordsafe/passwordsafe.SlackBuild +++ b/system/passwordsafe/passwordsafe.SlackBuild @@ -85,6 +85,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DNO_GTEST=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/system/pcem/pcem.SlackBuild b/system/pcem/pcem.SlackBuild index 36d31c9aba..dd31b2e276 100644 --- a/system/pcem/pcem.SlackBuild +++ b/system/pcem/pcem.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pcem -# Copyright 2022-2023 K. Eugene Carlson Tsukuba, Japan +# Copyright 2022-2025 K. Eugene Carlson Tsukuba, Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pcem VERSION=${VERSION:-b8ad941.20230304} SRCVERSION=${SRCVERSION:-b8ad9416bc1d3acd8b384a83b753ddf2282bd091} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -99,14 +99,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 {} \; +# Fix 32-bit build +zcat $CWD/x86-build.diff.gz | patch -p0 + mkdir build cd build +# -std=gnu17 is needed for gcc-15. cmake -G "Ninja" \ -DwxWidgets_CONFIG_OPTIONS="--version=3.0" \ - -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS -std=gnu17" \ -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DPCEM_LIB_DIR=/usr/lib$LIBDIRSUFFIX \ $USE_ALSA \ $USE_NETWORKING \ diff --git a/system/pcem/x86-build.diff.gz b/system/pcem/x86-build.diff.gz new file mode 100644 index 0000000000000000000000000000000000000000..5e6a8c49a7957ec6e639b7c86f9c9b0e05bd832d GIT binary patch literal 249 zcmV/pcsc/drivers flag -- this directory will be the -destination for usb readers' drivers (e.g. ccid, cardman, ...). - -Since version 1.6.0, serial support is not really maintained. Upstream -developer deems serial readers as rare, so he no longer provides reader.conf -file: if it's still required, you will have to manually create it in -/etc/reader.conf.d (please see 'man 5 reader.conf' for details). - -Since version 1.6.0, events are sent through the socket, so you have to -manually remove unused /var/run/pcscd/pcscd.events/ directory. diff --git a/system/pcsc-lite/doinst.sh b/system/pcsc-lite/doinst.sh deleted file mode 100644 index 8a2aa3a5c9..0000000000 --- a/system/pcsc-lite/doinst.sh +++ /dev/null @@ -1,26 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -preserve_perms() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ -e $OLD ]; then - cp -a $OLD ${NEW}.incoming - cat $NEW > ${NEW}.incoming - mv ${NEW}.incoming $NEW - fi - config $NEW -} - -preserve_perms etc/rc.d/rc.pcscd.new - diff --git a/system/pcsc-lite/pcsc-lite.SlackBuild b/system/pcsc-lite/pcsc-lite.SlackBuild deleted file mode 100644 index 57529c30e7..0000000000 --- a/system/pcsc-lite/pcsc-lite.SlackBuild +++ /dev/null @@ -1,179 +0,0 @@ -#!/bin/bash - -# Slackware build script for pcsc-lite - -# Copyright 2007-2015 LukenShiro, Italy -# Copyright 2020-2023 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. - -# 20230801 bkw: Modified by SlackBuilds.org, BUILD=2: -# - handle user and group detection better. -# - get rid of generic GNU INSTALL from doc dir. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=pcsc-lite -VERSION=${VERSION:-1.9.9} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -# Bail out if user or group isn't valid on your system -# For slackbuilds.org, assigned pcscd uid/gid are 257/257 -# See http://slackbuilds.org/uid_gid.txt -# 20230801 bkw: grepping /etc/passwd and /etc/group may fail if e.g. NIS -# or LDAP is in use; always use getent. Also, print both messages (for user -# and group) if either doesn't exist. -if ! getent group pcscd &>/dev/null || ! getent passwd pcscd &>/dev/null; then - echo " You must have a \"pcscd\" user and group to run this script." - echo " # groupadd -g 257 pcscd" - echo " # useradd -u 257 -g pcscd -d /var/run/pcscd -s /bin/false pcscd" - exit 1 -fi - -# Debug is off by default -DEBUGATR=${DEBUGATR:-0} -# Inserted card's automatic poweroff (on-demand power on) -AUTOPOFF=${AUTOPOFF:-0} # disabled by default - -# README and README.DAEMON are not useful and partly outdated. -DOCFILES="SECURITY ChangeLog* COPYING HELP NEWS TODO AUTHORS" - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 {} + - -# ATR (answer to reset) debug parsing output -case "$DEBUGATR" in - 0) DEBUGATR_FLAG="dis" ;; - *) DEBUGATR_FLAG="en" ;; -esac - -# disabling/enabling card's automatic power off -case "$AUTOPOFF" in - 0) sed -i "s|^\/\* #define DISABLE_ON_DEMAND_POWER_ON \*\/|#define DISABLE_ON_DEMAND_POWER_ON|" \ - src/pcscd.h.in - ;; - *) ;; -esac - -# --enable-runpid=/var/run/pcscd.pid, and -# --enable-muscledropdir="/pcsc/services" are not supported anymore; -# pid directory changed to /var/run/pcscd for consistency -# libhal support is gone -# API docs not included anymore -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --enable-ipcdir=/var/run/pcscd \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-usbdropdir="/usr/lib${LIBDIRSUFFIX}/pcsc/drivers" \ - --enable-confdir=/etc/reader.conf.d \ - --${DEBUGATR_FLAG}able-debugatr \ - --disable-libsystemd \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# formaticc manpage is not automatically installed -mkdir -p $PKG/usr/man/man1 -install -m 0644 doc/formaticc.1 $PKG/usr/man/man1/ - -# PC/SC-lite slackware-compliant daemon -mkdir -p $PKG/etc/rc.d -install -m 0755 $CWD/rc.pcscd $PKG/etc/rc.d/rc.pcscd.new - -# Correct manpages in reader.conf.5 and pcscd.8 -sed -i "s|@confdir@|/etc/reader.conf.d|g" $PKG/usr/man/man5/reader.conf.5 || exit 1 -sed -i "s|@sysconfdir_exp@/init.d/pcscd|/etc/rc.d/rc.pcscd|g" $PKG/usr/man/man8/pcscd.8 || exit 1 -sed -i "s|@sysconfdir_exp@|/etc/reader.conf.d|g" $PKG/usr/man/man8/pcscd.8 || exit 1 - -# Create the directory for drivers and such (not included with this package) -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pcsc/{drivers,services} - -find $PKG -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 $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE -# remove README.DAEMON, automatically installed by doc/Makefile. -rm -f $PKG/usr/doc/$PRGNAM-$VERSION/README.DAEMON - -rm -f $PKG/usr/lib*/*.la - -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 diff --git a/system/pcsc-lite/pcsc-lite.info b/system/pcsc-lite/pcsc-lite.info deleted file mode 100644 index 46c90a501e..0000000000 --- a/system/pcsc-lite/pcsc-lite.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pcsc-lite" -VERSION="1.9.9" -HOMEPAGE="https://pcsclite.apdu.fr/" -DOWNLOAD="https://pcsclite.apdu.fr/files/pcsc-lite-1.9.9.tar.bz2" -MD5SUM="23db832115db702e902baccf21da13aa" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/system/pcsc-lite/rc.pcscd b/system/pcsc-lite/rc.pcscd deleted file mode 100644 index 779ec844a7..0000000000 --- a/system/pcsc-lite/rc.pcscd +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# Start/Stop/Restart the PC/SC-lite smart card daemon. -# -# pcscd should be started after pcmcia and shut down -# before it for smooth experience with PCMCIA readers. -# - -PIDFILE=/var/run/pcscd/pcscd.pid -PCSCD_OPTS="" - -# Start -pcscd_start() { - if [ -x /usr/sbin/pcscd ]; then - if [ -e "$PIDFILE" ]; then - echo "PC/SC-lite daemon already started!" - else - echo "Starting PC/SC-lite smart card daemon..." - /usr/sbin/pcscd $PCSCD_OPTS - fi - fi -} - -# Stop -pcscd_stop() { - echo "Stopping PC/SC-lite smart card daemon..." - if [ -e "$PIDFILE" ]; then - kill $(cat $PIDFILE) - rm -f $PIDFILE 2>&1 >/dev/null - fi - # Just in case: - killall pcscd 2>&1 >/dev/null -} - -# Restart -pcscd_restart() { - pcscd_stop - sleep 3 - pcscd_start -} - -# Status -pcscd_status() { - if [ -e "$PIDFILE" ]; then - echo "pcscd is running." - else - echo "pcscd is stopped." - fi -} - -case "$1" in -'start') - pcscd_start - ;; -'stop') - pcscd_stop - ;; -'restart') - pcscd_restart - ;; -'status') - pcscd_status - ;; -*) - echo "usage: $0 start|stop|restart|status" -esac diff --git a/system/pcsc-lite/slack-desc b/system/pcsc-lite/slack-desc deleted file mode 100644 index db166182a4..0000000000 --- a/system/pcsc-lite/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pcsc-lite: pcsc-lite (Middleware to access a smart card using SCard API) -pcsc-lite: -pcsc-lite: Middleware to access a smart card using SCard API (PC/SC) -pcsc-lite: Its purpose is to provide a Windows(R) SCard interface in a -pcsc-lite: very small form factor for communicating to smart cards and -pcsc-lite: readers. -pcsc-lite: -pcsc-lite: Homepage: https://pcsclite.apdu.fr/ -pcsc-lite: -pcsc-lite: -pcsc-lite: diff --git a/system/piper/README b/system/piper/README index e0c95a70af..a633779d0e 100644 --- a/system/piper/README +++ b/system/piper/README @@ -1,6 +1,2 @@ Piper is a GTK+ application to configure gaming mice. Piper is merely a graphical frontend to the ratbagd DBus daemon. - -This SlackBuild disables build tests by default. To enable build tests -(flake8 additionally required), pass TESTS=yes to the SlackBuild: -TESTS=yes ./piper.SlackBuild diff --git a/system/piper/piper.SlackBuild b/system/piper/piper.SlackBuild index 72781fa795..15b4cfa5c4 100644 --- a/system/piper/piper.SlackBuild +++ b/system/piper/piper.SlackBuild @@ -79,9 +79,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 {} \+ -# Enable or disable tests -if [ ${TESTS:-no} = yes ]; then ENABLE_TESTS=true; else ENABLE_TESTS=false; fi - mkdir -p build cd build CFLAGS="$SLKCFLAGS" \ @@ -89,8 +86,7 @@ cd build meson .. \ --prefix=/usr \ --mandir=/usr/man \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - -Dtests=$ENABLE_TESTS + --libdir=/usr/lib${LIBDIRSUFFIX} "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. diff --git a/system/pmount/pmount.SlackBuild b/system/pmount/pmount.SlackBuild index a74b92a213..d875c35740 100644 --- a/system/pmount/pmount.SlackBuild +++ b/system/pmount/pmount.SlackBuild @@ -83,7 +83,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-implicit-function-declaration" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/polyglotman/gcc14.patch b/system/polyglotman/gcc14.patch new file mode 100644 index 0000000000..95d7c4e177 --- /dev/null +++ b/system/polyglotman/gcc14.patch @@ -0,0 +1,21 @@ +diff -Naur rman-3.2.orig/rman.c rman-3.2/rman.c +--- rman-3.2.orig/rman.c 2003-07-26 21:15:00.000000000 +0200 ++++ rman-3.2/rman.c 2025-04-04 08:19:27.736288000 +0200 +@@ -268,7 +268,7 @@ + else return 1; + } + +-int lcexceptionscmp(const char **a, const char **b) { return stricmp(*a, *b); } ++int lcexceptionscmp(const void *a, const void *b) { return stricmp(*(char**)a, *(char**)b); } + + int + strincmp(const char *s1, const char *s2, size_t n) { +@@ -4171,7 +4171,7 @@ + } else if (fTclTk && checkcmd("OP")) { + source_struct(BEGINBODY); + for (i=0; i<3; i++) { +- if (fcharout) { source_out(tcltkOP[i]); source_out(": "); } ++ if (fcharout) { source_out((char *)tcltkOP[i]); source_out(": "); } + stagadd(BEGINBOLD); p=source_out_word(p); stagadd(ENDBOLD); + source_struct(SHORTLINE); + } diff --git a/system/polyglotman/polyglotman.SlackBuild b/system/polyglotman/polyglotman.SlackBuild index 12ca18ac16..9994175dae 100644 --- a/system/polyglotman/polyglotman.SlackBuild +++ b/system/polyglotman/polyglotman.SlackBuild @@ -61,6 +61,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +patch -p1 < $CWD/gcc14.patch + make CFLAGS="$SLKCFLAGS" mkdir -p $PKG/usr/bin $PKG/usr/man/man1 make install BINDIR=$PKG/usr/bin MANDIR=$PKG/usr/man/man1 diff --git a/system/qemu/README b/system/qemu/README index db15c434e2..115cf21fb8 100644 --- a/system/qemu/README +++ b/system/qemu/README @@ -41,15 +41,17 @@ your processor) prior to launching qemu-system-ARCH with kvm enabled. For older/unmaintained qemu frontends, this build also creates a symlink to qemu-system-ARCH at /usr/bin/qemu-kvm. -libiscsi (to access iSCSI targets directly), libslirp (user mode -networking), libcacard, spice, usbredir, virglrenderer, libnfs, snappy, -glusterfs, and vde2, numactl. sphinx-rtd-theme and Sphinx (to build -documentation) are optional dependencies that will be automatically -detected during compilation, if present (all avialable on SBo). +libiscsi (to access iSCSI targets directly), libslirp, libcacard, spice +usbredir, virglrenderer, libnfs, snappy, glusterfs, and vde2, numactl, +sphinx-rtd-theme and Sphinx (to build documentation) are optional +dependencies that will be automatically detected during compilation, if +present (all available on SBo). -To enable user mode networking, install libslirp, then compile qemu: +To disable user mode networking compile qemu with: -SLIRP=yes ./qemu.SlackBuild + SLIRP=no ./qemu.SlackBuild + +The dependency virtiofsd isn't usable on a 32bit operating system. NOTES: This version breaks some backward compatibility with earlier versions. diff --git a/system/qemu/qemu-10.0.3-pip-25.2-compat.patch b/system/qemu/qemu-10.0.3-pip-25.2-compat.patch new file mode 100644 index 0000000000..f53b50bb25 --- /dev/null +++ b/system/qemu/qemu-10.0.3-pip-25.2-compat.patch @@ -0,0 +1,93 @@ +Fix compilation with pip-25.2 due to missing distlib.version + +Bug: https://gitlab.com/qemu-project/qemu/-/issues/3062 + +Signed-off-by: Sv. Lockal +--- a/python/scripts/mkvenv.py ++++ b/python/scripts/mkvenv.py +@@ -94,17 +94,35 @@ + HAVE_DISTLIB = True + try: + import distlib.scripts +- import distlib.version + except ImportError: + try: + # Reach into pip's cookie jar. pylint and flake8 don't understand + # that these imports will be used via distlib.xxx. + from pip._vendor import distlib + import pip._vendor.distlib.scripts # noqa, pylint: disable=unused-import +- import pip._vendor.distlib.version # noqa, pylint: disable=unused-import + except ImportError: + HAVE_DISTLIB = False + ++# pip 25.2 does not vendor distlib.version, but it uses vendored packaging.version ++HAVE_DISTLIB_VERSION = True ++try: ++ import distlib.version ++except ImportError: ++ try: ++ import pip._vendor.distlib.version # noqa, pylint: disable=unused-import ++ except ImportError: ++ HAVE_DISTLIB_VERSION = False ++ ++HAVE_PACKAGING_VERSION = True ++try: ++ # Do not bother importing non-vendored packaging, because it is not in stdlib. ++ import pip._vendor.packaging as packaging ++ import pip._vendor.packaging.version # noqa, pylint: disable=unused-import ++ import pip._vendor.packaging.requirements # noqa, pylint: disable=unused-import ++except ImportError: ++ HAVE_PACKAGING_VERSION = False ++ ++ + # Try to load tomllib, with a fallback to tomli. + # HAVE_TOMLLIB is checked below, just-in-time, so that mkvenv does not fail + # outside the venv or before a potential call to ensurepip in checkpip(). +@@ -133,6 +151,29 @@ class Ouch(RuntimeError): + """An Exception class we can't confuse with a builtin.""" + + ++class Matcher: ++ def __init__(self, name_and_constraint: str): ++ """Create a matcher from a requirement-like string.""" ++ if HAVE_DISTLIB_VERSION: ++ self._m = distlib.version.LegacyMatcher(name_and_constraint) ++ elif HAVE_PACKAGING_VERSION: ++ self._m = packaging.requirements.Requirement(name_and_constraint) ++ else: ++ raise Ouch("found neither distlib.version nor packaging.version") ++ self.name = self._m.name ++ ++ def match(self, version: str) -> bool: ++ """Return True if `version` satisfies the stored constraint.""" ++ if HAVE_DISTLIB_VERSION: ++ return self._m.match(distlib.version.LegacyVersion(version)) ++ elif HAVE_PACKAGING_VERSION: ++ return self._m.specifier.contains(packaging.version.Version(version), prereleases=True) ++ ++ def __repr__(self): ++ """Stable debug representation delegated to the backend.""" ++ return self._m.__repr__() ++ ++ + class QemuEnvBuilder(venv.EnvBuilder): + """ + An extension of venv.EnvBuilder for building QEMU's configure-time venv. +@@ -669,7 +710,7 @@ def _do_ensure( + canary = None + for name, info in group.items(): + constraint = _make_version_constraint(info, False) +- matcher = distlib.version.LegacyMatcher(name + constraint) ++ matcher = Matcher(name + constraint) + print(f"mkvenv: checking for {matcher}", file=sys.stderr) + + dist: Optional[Distribution] = None +@@ -683,7 +724,7 @@ def _do_ensure( + # Always pass installed package to pip, so that they can be + # updated if the requested version changes + or not _is_system_package(dist) +- or not matcher.match(distlib.version.LegacyVersion(dist.version)) ++ or not matcher.match(dist.version) + ): + absent.append(name + _make_version_constraint(info, True)) + if len(absent) == 1: diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild index 50cc5e6d90..f9759291ad 100644 --- a/system/qemu/qemu.SlackBuild +++ b/system/qemu/qemu.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qemu -VERSION=${VERSION:-9.2.0} +VERSION=${VERSION:-10.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -93,6 +93,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 {} + || true +patch -p1 < $CWD/qemu-10.0.3-pip-25.2-compat.patch + # Use newer meson from python3-meson-opt PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') export PYTHONPATH=/opt/python$PYVER/site-packages @@ -113,10 +115,10 @@ else fi # To enable user mode networking use SLIRP=yes -if [ "$SLIRP" = "yes" ]; then - with_slirp="--enable-slirp" +if [ "$SLIRP" = "no" ]; then + with_slirp="--disable-slirp" else - with_slirp="" + with_slirp="--enable-slirp" fi CFLAGS="$SLKCFLAGS" \ @@ -135,6 +137,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-sdl \ --enable-malloc=jemalloc \ --enable-nettle \ + --disable-docs \ --${uring}able-linux-io-uring \ --audio-drv-list=${AUDIODRIVERS} \ $with_slirp \ diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info index 12ca7b2fdf..33823a7363 100644 --- a/system/qemu/qemu.info +++ b/system/qemu/qemu.info @@ -1,10 +1,10 @@ PRGNAM="qemu" -VERSION="9.2.0" +VERSION="10.0.3" HOMEPAGE="https://www.qemu.org" -DOWNLOAD="https://download.qemu.org/qemu-9.2.0.tar.xz" -MD5SUM="ece615b98642720430236e20237dd936" +DOWNLOAD="https://download.qemu.org/qemu-10.0.3.tar.xz" +MD5SUM="4a244f485c9d7ac3d40f958f13eae298" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="device-tree-compiler python3-meson-opt" +REQUIRES="device-tree-compiler libslirp virtiofsd" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@linuxgalaxy.org" diff --git a/system/qps/qps.SlackBuild b/system/qps/qps.SlackBuild index f319f324ca..5e9873968a 100644 --- a/system/qps/qps.SlackBuild +++ b/system/qps/qps.SlackBuild @@ -83,6 +83,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/system/qt-sudo/README b/system/qt-sudo/README new file mode 100644 index 0000000000..c914f41d8e --- /dev/null +++ b/system/qt-sudo/README @@ -0,0 +1,3 @@ +This is a clone of LXQt sudo tool (without LXQt libs). + +It needs either sudo or doas to work. diff --git a/system/qt-sudo/qt-sudo.SlackBuild b/system/qt-sudo/qt-sudo.SlackBuild new file mode 100644 index 0000000000..6a83de14a7 --- /dev/null +++ b/system/qt-sudo/qt-sudo.SlackBuild @@ -0,0 +1,96 @@ +#!/bin/bash + +# Slackware build script for qt-sudo + +# Copyright 2025 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=qt-sudo +VERSION=${VERSION:-20240524_242342e} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.*z +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +qmake PREFIX=/usr +make +make install INSTALL_ROOT=$PKG + +#rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/qt-sudo/qt-sudo.info b/system/qt-sudo/qt-sudo.info new file mode 100644 index 0000000000..540fa380e1 --- /dev/null +++ b/system/qt-sudo/qt-sudo.info @@ -0,0 +1,10 @@ +PRGNAM="qt-sudo" +VERSION="20240524_242342e" +HOMEPAGE="https://github.com/aarnt/qt-sudo" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/qt-sudo-20240524_242342e.tar.xz" +MD5SUM="7e5e432815e05b0a8e469926b1db1f33" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/qt-sudo/slack-desc b/system/qt-sudo/slack-desc new file mode 100644 index 0000000000..4e55285928 --- /dev/null +++ b/system/qt-sudo/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------------------------------------------------------| +qt-sudo: qt-sudo (qt sudo interface) +qt-sudo: +qt-sudo: This is a clone of LXQt sudo tool (without LXQt libs). +qt-sudo: +qt-sudo: It needs either sudo or doas to work. +qt-sudo: +qt-sudo: homepage: https://github.com/aarnt/qt-sudo +qt-sudo: +qt-sudo: +qt-sudo: +qt-sudo: diff --git a/system/qterminal/qterminal.SlackBuild b/system/qterminal/qterminal.SlackBuild index 0d2384e2a8..2db11558b5 100644 --- a/system/qterminal/qterminal.SlackBuild +++ b/system/qterminal/qterminal.SlackBuild @@ -88,6 +88,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/system/qtgzmanager/qtgzmanager.SlackBuild b/system/qtgzmanager/qtgzmanager.SlackBuild index f33163798e..c015a7ad00 100644 --- a/system/qtgzmanager/qtgzmanager.SlackBuild +++ b/system/qtgzmanager/qtgzmanager.SlackBuild @@ -13,8 +13,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qtgzmanager -VERSION=${VERSION:-1.0.3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20240317_c259c24} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -52,7 +52,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -62,13 +62,12 @@ find -L . \ -exec chmod 644 {} \+ # 20220413 bkw: desktop-file-validate warnings. -sed -i -e '/^Encoding/d' -e '/^Cat/s,Application;,,' $PRGNAM.desktop +sed -i -e '/^Encoding/d' -e '/^Cat/s,Application;,,' $PRGNAM.desktop || exit 1 # 20220210 bkw: ordered comparison... -sed -i 's,>= 0),),' src/unixcommand.cpp +sed -i 's,>= 0),),' src/unixcommand.cpp || exit 1 -# 20220210 bkw: this is a qt4 app, use qmake-qt4. -qmake-qt4 \ +qmake \ QMAKE_LIBS="$SLKCFLAGS" \ QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" diff --git a/system/qtgzmanager/qtgzmanager.info b/system/qtgzmanager/qtgzmanager.info index e13f2afbfd..f68157bb6f 100644 --- a/system/qtgzmanager/qtgzmanager.info +++ b/system/qtgzmanager/qtgzmanager.info @@ -1,10 +1,10 @@ PRGNAM="qtgzmanager" -VERSION="1.0.3" +VERSION="20240317_c259c24" HOMEPAGE="https://qtgzmanager.wordpress.com" -DOWNLOAD="https://downloads.sourceforge.net/jtgzmanager/qtgzmanager-1.0.3-src.tar.bz2" -MD5SUM="6dad7e2603972b8cadaba2d319d01916" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/qtgzmanager-20240317_c259c24.tar.xz" +MD5SUM="5745970bb72b523d24b438543fe2a0ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="qt4" +REQUIRES="qt-sudo" MAINTAINER="Alexandre Albuquerque Arnt" EMAIL="aaarnt@gmail.com" diff --git a/system/runit/runit.SlackBuild b/system/runit/runit.SlackBuild index fe79f7b33d..b4d3bd3add 100644 --- a/system/runit/runit.SlackBuild +++ b/system/runit/runit.SlackBuild @@ -57,7 +57,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 {} \; -echo gcc $SLKCFLAGS -Wall > src/conf-cc +echo gcc $SLKCFLAGS -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE \ + -std=c89 > src/conf-cc + +sed -i '/#include.*/a #include ' src/{chpst,chkshsgr}.c +sed -i '0,/#include.*/a #include ' src/prot.c +sed -i '0,/#include.*/a #include ' \ + src/{pathexec_run,prot,seek_set}.c package/compile package/check diff --git a/system/rxvt/rxvt.SlackBuild b/system/rxvt/rxvt.SlackBuild index 1e2873648b..c7c56b5e5c 100644 --- a/system/rxvt/rxvt.SlackBuild +++ b/system/rxvt/rxvt.SlackBuild @@ -69,7 +69,7 @@ patch -p1 < $CWD/rxvt-integer-overflow-fix.diff patch -p1 < $CWD/rxvt.utempter.diff # Same configure options as Pat used: -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu17 -Wno-incompatible-pointer-types -Wno-implicit-function-declaration" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -94,6 +94,10 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-old-selection \ --build=$ARCH-slackware-linux +# set location of utmp and wtmp manually, configure doesn't detect them +sed -i 's|.*RXVT_UTMP_FILE.*|#define RXVT_UTMP_FILE "/run/utmp"|' config.h +sed -i 's|.*RXVT_WTMP_FILE.*|#define RXVT_WTMP_FILE "/var/log/wtmp"|' config.h + make make install DESTDIR=$PKG strip $PKG/usr/bin/* diff --git a/system/sboui/sboui.SlackBuild b/system/sboui/sboui.SlackBuild index ac5afd28e5..41814f29c1 100644 --- a/system/sboui/sboui.SlackBuild +++ b/system/sboui/sboui.SlackBuild @@ -107,6 +107,7 @@ cd build -DGRAPHICAL_SU:STRING="$GRAPHICAL_SU" \ -DTERMINAL_EMULATOR:STRING="$TERMINAL_EMULATOR" \ -DINSTALL_SYSTRAY_NOTIFIER:BOOL="$NOTIFIER" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -G "$GENERATOR" .. $BUILDCMD DESTDIR=$PKG $BUILDCMD install diff --git a/system/scdoc/README b/system/scdoc/README deleted file mode 100644 index 3c4b288e25..0000000000 --- a/system/scdoc/README +++ /dev/null @@ -1,3 +0,0 @@ -scdoc is a simple man page generator for POSIX systems written in C99. - -It requires the input files to be UTF-8 encoded. diff --git a/system/scdoc/scdoc.SlackBuild b/system/scdoc/scdoc.SlackBuild deleted file mode 100644 index 88098462e2..0000000000 --- a/system/scdoc/scdoc.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -# Slackware build script for scdoc - -# Copyright 2021 Manuel Argüelles Panama City, Panama -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=scdoc -VERSION=${VERSION:-1.11.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$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" \ -PREFIX=/usr \ -make -make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING \ - README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/scdoc/scdoc.info b/system/scdoc/scdoc.info deleted file mode 100644 index b5bfd41e34..0000000000 --- a/system/scdoc/scdoc.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="scdoc" -VERSION="1.11.2" -HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc" -DOWNLOAD="https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.2.tar.gz" -MD5SUM="0f6e8b9bb741f52d975081784757078b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Manuel Argüelles" -EMAIL="manuel.arguelles@gmail.com" diff --git a/system/scdoc/slack-desc b/system/scdoc/slack-desc deleted file mode 100644 index 1f56aa5e39..0000000000 --- a/system/scdoc/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -scdoc: scdoc (small man page generator) -scdoc: -scdoc: Simple man page generator for POSIX systems written in C99. -scdoc: -scdoc: -scdoc: -scdoc: -scdoc: -scdoc: -scdoc: -scdoc: diff --git a/system/schedtool/schedtool-1.3.0-c99.patch b/system/schedtool/schedtool-1.3.0-c99.patch new file mode 100644 index 0000000000..8f3c0b33af --- /dev/null +++ b/system/schedtool/schedtool-1.3.0-c99.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/918974 +https://src.fedoraproject.org/rpms/schedtool/c/f84b6a0fdc4b368e2b1c5ea59739f002063e3c9e?branch=rawhide + +Invoke decode_error separately with the correct argument types for +each variant. This avoids an int-conversion error. + +--- a/schedtool.c ++++ b/schedtool.c +@@ -422,19 +422,14 @@ int set_process(pid_t pid, int policy, int prio) + struct sched_param p; + int ret; + +- char *msg1="could not set PID %d to %s"; +- char *msg2="could not set PID %d to raw policy #%d"; +- + p.sched_priority=prio; + + /* anything other than 0 indicates error */ + if((ret=sched_setscheduler(pid, policy, &p))) { +- +- /* la la pointer mismatch .. lala */ +- decode_error((CHECK_RANGE_POLICY(policy) ? msg1 : msg2), +- pid, +- (CHECK_RANGE_POLICY(policy) ? TAB[policy] : policy) +- ); ++ if (CHECK_RANGE_POLICY(policy)) ++ decode_error("could not set PID %d to %s", pid, TAB[policy]); ++ else ++ decode_error("could not set PID %d to raw policy #%d", pid, policy); + return(ret); + } + return(0); + diff --git a/system/schedtool/schedtool.SlackBuild b/system/schedtool/schedtool.SlackBuild index e3b9e2cf60..793a21a680 100644 --- a/system/schedtool/schedtool.SlackBuild +++ b/system/schedtool/schedtool.SlackBuild @@ -56,6 +56,7 @@ 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/schedtool-1.3.0-c99.patch patch -p1 < $CWD/schedtool-Makefile.patch make install \ diff --git a/system/seahorse/patches/GnuPG-2.4.patch b/system/seahorse/patches/GnuPG-2.4.patch new file mode 100644 index 0000000000..0289bcd375 --- /dev/null +++ b/system/seahorse/patches/GnuPG-2.4.patch @@ -0,0 +1,25 @@ +From 9260c74779be3d7a378db0671af862ffa3573d42 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Wed, 21 Dec 2022 20:58:26 +0800 +Subject: [PATCH] Allow building with GnuPG-2.4.x + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e29b5322..23d0b54f 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,7 @@ endif + # Dependencies + min_glib_version = '2.66' + min_gcr_version = '3.38' +-accepted_gpg_versions = [ '2.2.0', '2.3.0' ] ++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ] + gpg_check_version = find_program('build-aux' / 'gpg_check_version.py') + + glib_deps = [ +-- +GitLab + diff --git a/system/seahorse/patches/avoid_C99_incompatibility_around_seahorse_pkcs11_backend_initialize.patch b/system/seahorse/patches/avoid_C99_incompatibility_around_seahorse_pkcs11_backend_initialize.patch new file mode 100644 index 0000000000..7fb8c10b58 --- /dev/null +++ b/system/seahorse/patches/avoid_C99_incompatibility_around_seahorse_pkcs11_backend_initialize.patch @@ -0,0 +1,40 @@ +From 3887ba07ccab4aa970c24a22a183b97e255e6ece Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 14 Apr 2023 14:37:23 +0200 +Subject: [PATCH] Avoid C99 incompatibility around + seahorse_pkcs11_backend_initialize + +Move the prototype for seahorse_pkcs11_backend_initialize into the +header file, so C code generated from Vala sources will use it. +This avoids an implicit function declaration during the C-build +of src/application.vala, and resulting build failures with future +compilers. +--- + pkcs11/seahorse-pkcs11-backend.c | 2 -- + pkcs11/seahorse-pkcs11-backend.h | 2 ++ + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pkcs11/seahorse-pkcs11-backend.c b/pkcs11/seahorse-pkcs11-backend.c +index b7ea21e1f..31d7cb815 100644 +--- a/pkcs11/seahorse-pkcs11-backend.c ++++ b/pkcs11/seahorse-pkcs11-backend.c +@@ -43,8 +43,6 @@ enum { + PROP_LOADED, + }; + +-void seahorse_pkcs11_backend_initialize (void); +- + static SeahorsePkcs11Backend *pkcs11_backend = NULL; + + struct _SeahorsePkcs11Backend { +diff --git a/pkcs11/seahorse-pkcs11-backend.h b/pkcs11/seahorse-pkcs11-backend.h +index ddcfd2fcc..65efbd0a0 100644 +--- a/pkcs11/seahorse-pkcs11-backend.h ++++ b/pkcs11/seahorse-pkcs11-backend.h +@@ -43,4 +43,6 @@ SeahorsePkcs11Backend * seahorse_pkcs11_backend_get (void); + GcrCollection * seahorse_pkcs11_backend_get_writable_tokens (SeahorsePkcs11Backend *self, + gulong with_mechanism); + ++void seahorse_pkcs11_backend_initialize (void); ++ + #endif /* SEAHORSE_PKCS11_BACKEND_H_ */ diff --git a/system/seahorse/patches/refactor_ssh_key_parsing.patch b/system/seahorse/patches/refactor_ssh_key_parsing.patch new file mode 100644 index 0000000000..26568d115b --- /dev/null +++ b/system/seahorse/patches/refactor_ssh_key_parsing.patch @@ -0,0 +1,512 @@ +From 87a5e5312beac6cbe3b39f72cf0f120f1ed00473 Mon Sep 17 00:00:00 2001 +From: Niels De Graef +Date: Sat, 21 Oct 2023 15:43:04 +0200 +Subject: [PATCH] ssh: Refactor SSH key parsing + +Fix several issues in the SSH Key parsing code, and directly use a +`GInputStream` we can (asynchronously) read from. Take the opportunity +also to add some unit tests that we can run to make sure we're not +regressing on anything. +--- + ssh/key-data.vala | 59 +++++----- + ssh/key.vala | 58 +++++----- + ssh/meson.build | 20 ++++ + ssh/source.vala | 9 +- + ssh/test-key-parse.vala | 231 ++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 316 insertions(+), 61 deletions(-) + create mode 100644 ssh/test-key-parse.vala + +diff --git a/ssh/key-data.vala b/ssh/key-data.vala +index 1fdb1e6a8..8843bff84 100644 +--- a/ssh/key-data.vala ++++ b/ssh/key-data.vala +@@ -101,12 +101,12 @@ public class Seahorse.Ssh.KeyData : GLib.Object { + return result; + } + +- internal static string parse_key_blob (uchar[] bytes) throws GLib.Error { ++ internal static string parse_key_blob(uchar[] bytes) throws GLib.Error { + string digest = Checksum.compute_for_data(ChecksumType.MD5, bytes); + if (digest == null) + throw new Error.GENERAL("Can't calculate fingerprint from key."); + +- StringBuilder fingerprint = new StringBuilder.sized((digest.length * 3) / 2); ++ var fingerprint = new StringBuilder.sized((digest.length * 3) / 2); + for (size_t i = 0; i < digest.length; i += 2) { + if (i > 0) + fingerprint.append_c(':'); +@@ -147,7 +147,7 @@ public class Seahorse.Ssh.KeyData : GLib.Object { + string contents; + FileUtils.get_contents(filename, out contents); + +- StringBuilder results = new StringBuilder(); ++ var results = new StringBuilder(); + + // Load each line + bool first = true; +@@ -204,54 +204,65 @@ public class Seahorse.Ssh.SecData : GLib.Object { + * + * @param data The data that contains a private key. + */ +- public static SecData parse_data(StringBuilder data) throws GLib.Error { +- SecData secdata = new SecData(); ++ public static SecData parse_data(DataInputStream data, string initial_line) throws GLib.Error { ++ var secdata = new SecData(); + + // Get the comment +- if (data.str.has_prefix(SSH_KEY_SECRET_SIG)) { +- string comment = data.str.split("\n", 2)[0]; +- secdata.comment = comment.substring(SSH_KEY_SECRET_SIG.length).strip(); ++ if (initial_line.has_prefix(SSH_KEY_SECRET_SIG)) { ++ secdata.comment = initial_line.substring(SSH_KEY_SECRET_SIG.length).strip(); + } + + // First get our raw data (if there is none, don't bother) +- string rawdata = parse_lines_block(data, SSH_PRIVATE_BEGIN, SSH_PRIVATE_END); ++ string rawdata = parse_lines_block(data, initial_line, SSH_PRIVATE_BEGIN, SSH_PRIVATE_END); + if (rawdata == null || rawdata == "") + throw new Error.GENERAL("Private key contains no data."); + + secdata.rawdata = rawdata; + +- // Guess at the algorithm type +- secdata.algo = Algorithm.guess_from_string(rawdata); ++ // Guess the algorithm type by searching the base64 decoded data. (we ++ // should properly exclude the start/end line, but it shouldn't harm ++ // too much though afaik). Note that it's definitely not ideal though; ++ // but the openssh format isn't exactly obvious ++ var decoded = Base64.decode(rawdata.offset(initial_line.length)); ++ for (uint i = 0; i < decoded.length - 3; i++) { ++ unowned var str = ((string) decoded).offset(i); ++ var algo = Algorithm.from_string(str); ++ if (algo != Algorithm.UNKNOWN) { ++ secdata.algo = algo; ++ break; ++ } ++ } + + return secdata; + } + +- /** +- * Takes everything between the start and end pattern and returns it. +- * NOTE: The string (if found will) be removed from the argument. +- */ +- private static string parse_lines_block(StringBuilder data, string start, string end) { +- StringBuilder result = new StringBuilder(); ++ /** Reads all lines from start until the end pattern and returns it */ ++ private static string parse_lines_block(DataInputStream data, ++ string initial_line, ++ string start, string end) ++ throws GLib.Error { ++ var result = new StringBuilder(); ++ ++ string? line = initial_line; + + bool start_found = false; +- string[] lines = data.str.split("\n"); +- foreach (string line in lines) { ++ do { + // Look for the beginning + if (!start_found) { + if (start in line) { +- result.append_printf("%s\n", line); +- result.erase(0, line.length + 1); ++ result.append(line); ++ result.append_c('\n'); + start_found = true; + continue; + } + } else { + // Look for the end +- result.append_printf("%s\n", line); +- result.erase(0, line.length + 1); ++ result.append(line); ++ result.append_c('\n'); + if (end in line) + break; + } +- } ++ } while ((line = data.read_line_utf8()) != null); + + return result.str; + } +diff --git a/ssh/key.vala b/ssh/key.vala +index e2ebc30b3..453f8dd2c 100644 +--- a/ssh/key.vala ++++ b/ssh/key.vala +@@ -223,24 +223,36 @@ public class Seahorse.Ssh.Key : Seahorse.Object, Seahorse.Exportable, Seahorse.D + } + + /** +- * Parses a string into public/private keys. ++ * Parses an input stream into public/private keys. + * +- * @param data The string that needs to be parsed. ++ * @param input The input stream that needs to be parsed. + * @param cancellable Can be used to cancel the parsing. + */ +- public static async KeyParseResult parse(string data, +- Cancellable? cancellable = null) throws GLib.Error { +- return_if_fail (data != null || data != ""); +- ++ public static async KeyParseResult parse(GLib.InputStream input, ++ Cancellable? cancellable = null) ++ throws GLib.Error { + var pubkeys = new GenericArray(); + var seckeys = new GenericArray(); + +- StringBuilder toParse = new StringBuilder(data.chug()); +- while (toParse.str.length > 0) { ++ // Fetch the data into a string ++ var data = new DataInputStream(input); ++ ++ while (true) { ++ // Read the next line, and remove leading whitespace ++ var raw_line = yield data.read_line_utf8_async(Priority.DEFAULT, cancellable, null); ++ if (raw_line == null) ++ break; ++ ++ string line = raw_line.chug(); ++ ++ // Ignore comments and empty lines (not a parse error, but no data) ++ if (line == "" || line.has_prefix("#")) ++ continue; ++ + // First of all, check for a private key, as it can span several lines +- if (SecData.contains_private_key(toParse.str)) { ++ if (SecData.contains_private_key(line)) { + try { +- var secdata = SecData.parse_data(toParse); ++ var secdata = SecData.parse_data(data, line); + seckeys.add(secdata); + continue; + } catch (GLib.Error e) { +@@ -248,24 +260,9 @@ public class Seahorse.Ssh.Key : Seahorse.Object, Seahorse.Exportable, Seahorse.D + } + } + +- // We're sure we'll have at least 1 element +- string[] lines = toParse.str.split("\n", 2); +- string line = lines[0]; +- toParse.erase(0, line.length); +- if (lines.length == 2) // There was a \n, so don't forget to erase it as well +- toParse.erase(0, 1); +- +- // Comments and empty lines, not a parse error, but no data +- if (line.strip() == "" || line.has_prefix("#")) +- continue; +- + // See if we have a public key +- try { +- KeyData keydata = KeyData.parse_line(line); +- pubkeys.add(keydata); +- } catch (GLib.Error e) { +- warning(e.message); +- } ++ var keydata = KeyData.parse_line(line); ++ pubkeys.add(keydata); + } + + var result = KeyParseResult(); +@@ -282,9 +279,8 @@ public class Seahorse.Ssh.Key : Seahorse.Object, Seahorse.Exportable, Seahorse.D + */ + public static async KeyParseResult parse_file(string filename, + Cancellable? cancellable = null) throws GLib.Error { +- string contents; +- FileUtils.get_contents(filename, out contents); +- +- return yield parse(contents, cancellable); ++ var file = GLib.File.new_for_path(filename); ++ var file_stream = yield file.read_async(); ++ return yield parse(file_stream, cancellable); + } + } +diff --git a/ssh/meson.build b/ssh/meson.build +index 15418772e..c2c81a6a9 100644 +--- a/ssh/meson.build ++++ b/ssh/meson.build +@@ -58,3 +58,23 @@ ssh_askpass = executable('ssh-askpass', + install: true, + install_dir: libexecbindir, + ) ++ ++# Tests ++ssh_test_names = [ ++ 'key-parse', ++] ++ ++foreach _test : ssh_test_names ++ test_bin = executable(_test, ++ files('test-@0@.vala'.format(_test)), ++ dependencies: [ ++ ssh_dep, ++ ssh_dependencies, ++ ], ++ include_directories: include_directories('..'), ++ ) ++ ++ test(_test, test_bin, ++ suite: 'ssh', ++ ) ++endforeach +diff --git a/ssh/source.vala b/ssh/source.vala +index c4646c9fb..43b4a1ab0 100644 +--- a/ssh/source.vala ++++ b/ssh/source.vala +@@ -333,15 +333,12 @@ public class Seahorse.Ssh.Source : GLib.Object, Gcr.Collection, Seahorse.Place { + /** + * Parse an inputstream into a list of keys and import those keys. + */ +- public async List? import_async(InputStream input, Gtk.Window transient_for, ++ public async List? import_async(InputStream input, ++ Gtk.Window? transient_for, + Cancellable? cancellable = null) throws GLib.Error { +- uint8[] buffer = new uint8[4096]; +- size_t bytes_read; +- input.read_all(buffer, out bytes_read, cancellable); ++ var result = yield Key.parse(input, cancellable); + + string fullpath = other_keys_path(); +- +- var result = yield Key.parse((string) buffer, cancellable); + foreach (unowned var keydata in result.public_keys) { + yield import_public_async(keydata, fullpath, cancellable); + } +diff --git a/ssh/test-key-parse.vala b/ssh/test-key-parse.vala +new file mode 100644 +index 000000000..ef9404790 +--- /dev/null ++++ b/ssh/test-key-parse.vala +@@ -0,0 +1,231 @@ ++/* ++ * Seahorse ++ * ++ * Copyright (C) 2023 Niels De Graef ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * 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 ++ * . ++ */ ++ ++void main(string[] args) { ++ Test.init(ref args); ++ ++ Test.add_func("/ssh/key-parse/pubkey-simple", test_key_parse_pubkey_simple); ++ Test.add_func("/ssh/key-parse/pubkey-bad-algo", test_key_parse_pubkey_bad_algo); ++ Test.add_func("/ssh/key-parse/pubkey-multple", test_key_parse_pubkey_multiple); ++ ++ Test.add_func("/ssh/key-parse/private-key-simple", test_key_parse_private_key_simple); ++ Test.add_func("/ssh/key-parse/private-key-pw-protected", test_key_parse_private_key_pw_protected); ++ ++ Test.run(); ++} ++ ++const string PUBKEY_SIMPLE = """ ++ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCi9ZNp78OzcMpR9QeSKKCybNxTR+ailXs3cwizr1R9Dlx/EobQBXOwE2Ed5PqSU5HEgtYRoKqlTxMogMXMX508dedC0ADTzM09B3OBqpZ7YnMuyLbtk1MNP8xcvVmHwwfw3Y79xxZZeqjUTI7cSE6jcNyz/k/Dl+6RYI552ab80b1kgDDwOyUL75hFllEZ9vHCcAOtk7y5LyeUpnRu5WJq0YBPVQljeYs23ZiTSo5NkJd7pvV9hs68ZAYqm1POXwCcAKOj4HXW3AL83AD49g8MJOAelCMaJpUkOgn4n4QTtqLEC108sqZgwWiadbN/ZHt3Idbn3AIxMMhD/wdkSwkfm9tAohMrqYpSiG31xyifH61mcoBMSxRMQhUscCGV3kLo6P/dZtxRbu4r74r/Ae2Jg4pzYrVFVzfObXdlTjtxJmR8UvnZg60OE0RwYMs1LJTE6xakcAg22O9i3bau00MoIIYEPgiFFP5t0Tw3D06BcEzr/2wEzlvbxy0qzDTr40U= testsimple ++"""; ++ ++private void test_key_parse_pubkey_simple() { ++ var input = new MemoryInputStream.from_data(PUBKEY_SIMPLE.data); ++ ++ var mainloop = new GLib.MainLoop(); ++ Seahorse.Ssh.Key.parse.begin(input, null, (obj, res) => { ++ try { ++ var parse_result = Seahorse.Ssh.Key.parse.end(res); ++ ++ assert_true(parse_result.public_keys.length == 1); ++ unowned var keydata = parse_result.public_keys[0]; ++ assert_true(keydata.comment == "testsimple"); ++ assert_true(keydata.algo == Seahorse.Ssh.Algorithm.RSA); ++ ++ assert_true(parse_result.secret_keys.length == 0); ++ } catch (Error err) { ++ error("Couldn't parse public key: %s", err.message); ++ } finally { ++ mainloop.quit(); ++ } ++ }); ++ mainloop.run(); ++} ++ ++// Basically the same as PUBKEY_SIMPLE, but a bogus algorithm ++const string PUBKEY_BAD_ALGO = """ ++ssh-blabla AAAAB3NzaC1yc2EAAAADAQABAAABgQCi9ZNp78OzcMpR9QeSKKCybNxTR+ailXs3cwizr1R9Dlx/EobQBXOwE2Ed5PqSU5HEgtYRoKqlTxMogMXMX508dedC0ADTzM09B3OBqpZ7YnMuyLbtk1MNP8xcvVmHwwfw3Y79xxZZeqjUTI7cSE6jcNyz/k/Dl+6RYI552ab80b1kgDDwOyUL75hFllEZ9vHCcAOtk7y5LyeUpnRu5WJq0YBPVQljeYs23ZiTSo5NkJd7pvV9hs68ZAYqm1POXwCcAKOj4HXW3AL83AD49g8MJOAelCMaJpUkOgn4n4QTtqLEC108sqZgwWiadbN/ZHt3Idbn3AIxMMhD/wdkSwkfm9tAohMrqYpSiG31xyifH61mcoBMSxRMQhUscCGV3kLo6P/dZtxRbu4r74r/Ae2Jg4pzYrVFVzfObXdlTjtxJmR8UvnZg60OE0RwYMs1LJTE6xakcAg22O9i3bau00MoIIYEPgiFFP5t0Tw3D06BcEzr/2wEzlvbxy0qzDTr40U= testbad ++"""; ++ ++private void test_key_parse_pubkey_bad_algo() { ++ var input = new MemoryInputStream.from_data(PUBKEY_BAD_ALGO.data); ++ ++ var mainloop = new GLib.MainLoop(); ++ Seahorse.Ssh.Key.parse.begin(input, null, (obj, res) => { ++ try { ++ Seahorse.Ssh.Key.parse.end(res); ++ assert_not_reached(); ++ } catch (Error err) { ++ // Expected ++ } finally { ++ mainloop.quit(); ++ } ++ }); ++ mainloop.run(); ++} ++ ++const string PUBKEY_MULTIPLE = """ ++ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCi9ZNp78OzcMpR9QeSKKCybNxTR+ailXs3cwizr1R9Dlx/EobQBXOwE2Ed5PqSU5HEgtYRoKqlTxMogMXMX508dedC0ADTzM09B3OBqpZ7YnMuyLbtk1MNP8xcvVmHwwfw3Y79xxZZeqjUTI7cSE6jcNyz/k/Dl+6RYI552ab80b1kgDDwOyUL75hFllEZ9vHCcAOtk7y5LyeUpnRu5WJq0YBPVQljeYs23ZiTSo5NkJd7pvV9hs68ZAYqm1POXwCcAKOj4HXW3AL83AD49g8MJOAelCMaJpUkOgn4n4QTtqLEC108sqZgwWiadbN/ZHt3Idbn3AIxMMhD/wdkSwkfm9tAohMrqYpSiG31xyifH61mcoBMSxRMQhUscCGV3kLo6P/dZtxRbu4r74r/Ae2Jg4pzYrVFVzfObXdlTjtxJmR8UvnZg60OE0RwYMs1LJTE6xakcAg22O9i3bau00MoIIYEPgiFFP5t0Tw3D06BcEzr/2wEzlvbxy0qzDTr40U= test1 ++ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDADxtTchMRaGP2YCG5Iiu/sCkdKYkogkZ9NrawGutvwcoQL4D3oIC+r+ka3YzenICz0Rpu4ZIyGzn5s7VISzjcGK99a8/UoXsSyTUy37ihbpAbkYju+avtJZyCMOrRyrXp0W8gSKnUuxDJJNlG5+Jhjdh35rGo7ENSDIGRBXx0uLmKvxbPGSQoULbUzxJRVes6HW7cr44RXG4GL5uekS5hSHN/wJuc/OBqT2ETn+Ivn8cj2fooR6Y7Ei6uFNwbNebYgzDzNOTfaGssCXoEqWL9dJA8FAXA9u4BQskIaUm9SiQblzKGZSKtoPPFh7Sp7Ii1k2TAG0g9VW8gYqUZgLZY4OKjARR+SkdyzlnJKOD1QuSIrnyDNOgl7SBwtujT6gg+9bcQzSPVRWuPldYj2qYEZiR7LPood7AvzDL2tZwb8r60O5KDip+66inj5BxmPO6Vmeo84DLXdZNhEnoCfaL5J9qArhTvxYPjU8RiuBoy6nqN00IWeT2e3RZTPjpq1wc= test2 ++"""; ++ ++private void test_key_parse_pubkey_multiple() { ++ var input = new MemoryInputStream.from_data(PUBKEY_MULTIPLE.data); ++ ++ var mainloop = new GLib.MainLoop(); ++ Seahorse.Ssh.Key.parse.begin(input, null, (obj, res) => { ++ try { ++ var parse_result = Seahorse.Ssh.Key.parse.end(res); ++ assert_true(parse_result.public_keys.length == 2); ++ assert_true(parse_result.secret_keys.length == 0); ++ } catch (Error err) { ++ error("Couldn't parse public key: %s", err.message); ++ } finally { ++ mainloop.quit(); ++ } ++ }); ++ mainloop.run(); ++} ++ ++const string PRIVATE_KEY_SIMPLE = """ ++-----BEGIN OPENSSH PRIVATE KEY----- ++b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn ++NhAAAAAwEAAQAAAYEAvR0sY6LuyQBk0eWtHlblilTu5ywOxIPtX5Xz1DQ/nTs3+EiuUjpX ++7wpBd0X8KLVwF8XqrgsS/cZGKKwwTTIthifiOkIin2M1c5zqjq5mYXLd8OVy7FPGz3kRcY ++bqcZ5IhH6rrccLKgqz8F8YDZ1PP/zViRV6pjL4M9V+vM50JNbc09o199rOhrIfzWpbmbsU ++L98ADNFdyAexJAo46I5KF4ABp43y8fxKVkOQmouN92ao5s4tktkU2RDieAQEGS5tCcuabM ++vyq+nsZ3SxhAAM+k1A98F4sDaPBLMvQrGTRfIhbtPEqJsffzmoNiLsuFooCB8bbrpb5gp0 ++pvoQCDomWPR618KJSt6c2JCpxd0v64N+xaGjeuKnH+nGeQ2I8KjGz49bpTsNU/XHSAJHS8 ++72GiVZ1sVeEGxU2nR58Faixg6quEQr/SjjFCLTjV1v9zXmYLGUC2WoYrvh8Xv1/5u11WG9 ++jxbZrwNeHR5b0mL4espyAaxhyP093cRj0am3HX03AAAFiLLBfcCywX3AAAAAB3NzaC1yc2 ++EAAAGBAL0dLGOi7skAZNHlrR5W5YpU7ucsDsSD7V+V89Q0P507N/hIrlI6V+8KQXdF/Ci1 ++cBfF6q4LEv3GRiisME0yLYYn4jpCIp9jNXOc6o6uZmFy3fDlcuxTxs95EXGG6nGeSIR+q6 ++3HCyoKs/BfGA2dTz/81YkVeqYy+DPVfrzOdCTW3NPaNffazoayH81qW5m7FC/fAAzRXcgH ++sSQKOOiOSheAAaeN8vH8SlZDkJqLjfdmqObOLZLZFNkQ4ngEBBkubQnLmmzL8qvp7Gd0sY ++QADPpNQPfBeLA2jwSzL0Kxk0XyIW7TxKibH385qDYi7LhaKAgfG266W+YKdKb6EAg6Jlj0 ++etfCiUrenNiQqcXdL+uDfsWho3ripx/pxnkNiPCoxs+PW6U7DVP1x0gCR0vO9holWdbFXh ++BsVNp0efBWosYOqrhEK/0o4xQi041db/c15mCxlAtlqGK74fF79f+btdVhvY8W2a8DXh0e ++W9Ji+HrKcgGsYcj9Pd3EY9Gptx19NwAAAAMBAAEAAAGAEepQGLZIObl0U6AW+N9RinvGUB ++cP5RT8aUg625kBh8Mi57326apGR0po7kQugarCjjX9J/S7nVfpsJOzVbTRtDpWB5/ZSNEs ++sKGmZNLntwabOOV7sCC1nlUBTohx8EaG5ypa2DEZgSeXaUeQ70U+SzkH/58Nye3dLofkpD ++1Iqm7CZ71tzGeplgAM3DhdqiAbZveQuSYiZL85zEi9oGZOZZCGV5mucLcuUaK/8awTzGKo ++0Iiqr5UqEPA1DBqRStNnbfu265Zc/VacI0Z+00dMiO7VQ1lB5TnO9MkuEU3Kd59sHKvuX0 ++Hw5V2BqvJVqdqF5j6yxAExD7J8JNybcpE+LXzgysTBAEg2QPQa4GzWERytWSddVU+LTrEu ++BOb8o2bMV4eHbo7Y06ziq+MJQIDWJr7qNMbDtaV5UCNWcIlYaKX9X8si0qFBzHPRTx53aV ++beb4C5G8Ce4HU4Q3eEC0idCSpALEZEb8NIqxHigWuQKlqAhju31IIFjPoJ8uvs/49VAAAA ++wD2DtKmKzpZrguKjUrMTtCyh8cRxvvACe5ij6oPlhnJJ3Hlyb5QkH/FMqudJhkOaZrLjz0 ++JFLXQ4SUoUxdnolBb5B6wNfL66CXCurwR8MzHxHZyNL2+EB/jHhgF5Oh631LShe9GHJ+nE ++umN9zzDmW4pfWIoUZbzaNi2IQS4Qv+pJWk/uQFzqnS39HQkdgNh8s3sPJQUvykgbD24vNu ++qzML23S3NxsJfxJzsl8HL7LTaf08toSXeNqif4iPxuy0F9nAAAAMEA+MjSgU7GxqAjgE+7 ++zTKbEAw2WZhSWk+sHDSzTpt7T6JhTbsD0I+ZXqb3lcrKTnxjGP8bj4zWeH/mtpVCRDb/xE ++cOjku/aszvCBHKcD9naE+U/pOqwWR60jPb65+2hvBxqCFKb+2FVeM7E7BYL4kSQ/FV3svu ++rCQ0+liFnD4VxDbvNHDXz2h9RlqYTjZ90/d5I4oibuHPvcy3jMri99qBuvPj/8BhfPBmKw ++o+VZpJbWHEfuDZx1Rr3vRx3VtmfLLFAAAAwQDCmU8SYZ/GYR/EQU3MfIK/3wVKiasBh3a/ ++gIgD1+wnobau0MHd8vvGdehLPNVHKQ0/QkOsIdQl1XEKXFaNNGo8ZMHsawacdRze7ulfpe ++LSYdlqKqu73m2wy8LsY+IGSZGRkjCK1LNJevU8ec0nHSUGIn49VK+jPPjyNGHZw5yIL8QE ++nmvLcmgqiGQHjsArmk4NAdA5LGJSF3EfSKDx1Rs1CKCn/3+tpIbTpVZl6r1IDpuLPOvtYO ++f5GQO1BGgcf8sAAAAQbmRlZ3JhZWZAdG9vbGJveAECAw== ++-----END OPENSSH PRIVATE KEY----- ++"""; ++ ++private void test_key_parse_private_key_simple() { ++ var input = new MemoryInputStream.from_data(PRIVATE_KEY_SIMPLE.data); ++ ++ var mainloop = new GLib.MainLoop(); ++ Seahorse.Ssh.Key.parse.begin(input, null, (obj, res) => { ++ try { ++ var parse_result = Seahorse.Ssh.Key.parse.end(res); ++ assert_true(parse_result.public_keys.length == 0); ++ ++ assert_true(parse_result.secret_keys.length == 1); ++ unowned var secdata = parse_result.secret_keys[0]; ++ assert_null(secdata.comment); ++ assert_true(secdata.algo == Seahorse.Ssh.Algorithm.RSA); ++ } catch (Error err) { ++ error("Couldn't parse private key: %s", err.message); ++ } finally { ++ mainloop.quit(); ++ } ++ }); ++ mainloop.run(); ++} ++ ++// Key with "test" password ++const string PRIVATE_KEY_PW_PROTECTED = """ ++-----BEGIN OPENSSH PRIVATE KEY----- ++b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABAkHotf4u ++iTM795vuCNSfZBAAAAEAAAAAEAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQDcelHwoS/V ++AG2fg+gUkDFswBxazTuSASmXs5JXCPt3LpYRS38xr+LXH8APUBLoVTJbmU3QFMg9SCNVGp ++5hGKE3mYt9+EIMQQrQfSTGfU0JwLldNyO9pIPDW1ANjoP7fuGxVQpbHlbekNdZvVTarQS2 ++bJlIq2V4YwROyK6NRUj0JtRxlR0PQsdoOuCnzB0HUsRR4aSBkieVEytLy+/nhjSn22bz+g ++1XW3FePmEEGWXfKtCLXAXSkLiTmT0AgFCZyjbYjxJHWvJZ1ndiVsQSQFuAkvMfzoflBhfT ++pUMU22rl0GVsycJ06HkI9GF4aHjqzADvS4AvynKt+CQ7K/PDSAeGxNC7qa26OmBQPPT3Xw ++2PjqpqHpa/Hlx/G3nAMC6lzefHhAJkAB2wGF4DS/OxGTaS3rf+lJEVU7WSbLH9C5kTiqxf ++dlTC88ln9J2xHgnwewXfYbBbjqBbt6F1xSYBstm4o64fWzXdbsh0PzBBixGkFN0LZRuymB ++t0+jcxZwBL/UcAAAWQsqRgReFcL5tiXLDHd+pZxv3+mIyrqszEnoAw6/BGkt7UAFu2Gx5B ++3acmLUS5rgUmij+duFWPL4yZ3MW5ZJmCk89lkRholdIdFsZO3qz0L+fZ8mPa5IGxomrDxN ++mZiMQGSS+JnGsYxylAVucGmld02kP6F4hGYKMYsyUUQPtDg3qGJ4xckWfCLtaPUO0siLui ++//1lzHdT0dmodAMAxcXbwmlOYcpHDxSH5H9IfhzhTGQpHHw7aWys80G1HHRiClQDQgWvIg ++Wj/U30k2RuJYtfgIAcacvp4Fk1UMdUazrwfAogrjkLF2A6jqgYW6r2S1sITbruz0GrmXZy ++XHMA+cO2XsizMZOZAxpJmSkA04sb/gPiXOb+vBHAtjhY42Oucc0xg97QH1KfjBWG7yAqyc ++NC4XQ38ipF/Fyx0YCiZSysL37PGZlZo/sa8B8/9yb4/oSgyFhtE7aR/VI69ZWMjYSoc3/E ++yGIzEf67IC/BKNqBV281h6jc7DTr7F5nsdUHB0JdNmLf7sCVzDPNw+Gc88jHoV8eki9NJ3 ++X1vnzu2CnhvPYoVgb9GOmPAPD9PgB2W3wQ8lznIrcdKduWbi0uQJ8z/UWvJYs5nxZSBaW6 ++elVmeKjonzK/MX+U0pmKJnYLMkZ88PolzCY0Bka3mwcQGUjyq+GdUjo5yY1eeSW8bwNNRJ ++3riCVg7Zga5EQyNcAjxUP9gLkeFcHyIhyLlRGLLKtuNa+EkvcXzNVvUs1rP8KkusZrcbuH ++yZMUjOAvauXMwAiEm042QEUlQz6HGtVqmOnmTbsZQQ/DZqrAEgX8FoiRlWG76uQxvfo4qd ++cf/y3wapJfawFZ8rkQUtq4FsLGtIv4KYUyWgYlzpQvLolvTaNFcZNO75T2RrJ4DW/z8nDl ++2EdS0H+VxMa9At0D0kxxkJAKqQRhrT4axs3IUqbOVk4ztkcLmlHaxC+spxwspYQjyx785r ++oNgLcQnesQqIpRe0uVBaHbdOGrvWs2TUKBWxjVeXVZkenwU1Mnu+STXKhzcvtU0jHuei/Y ++fFxQg1P/KG7KWr+qoD1zBsKCQpv04VgFotexapUU6sW9tJdIpiplha43xt1fWRPFz3VA+/ ++GORk5nLRk1Rqdx8H1fClGACXyNy/jo4LyJavlH8j5eTdvbHAswEaXbR3XpXPUXlBXQRKzd ++INK8qEfl0Kk4SB/y/PLjr4J7xgFOTDtAbtZIa0T4woeIXbNd6D3gwG4VB7H8z56pms2sYf ++vE3a+xCGIdDyEqK3kNIy6j7ex3+E5AxHO0/vbG/2kDZlZUWI+9EeiMqLTx6QQeAQ9DQoDB ++E7BiJOPSJhjAhuTbxBaf29z8pC3P5EwJoRbpERoAlMmRoIdEL8UzHns97dB8mj0lgLJuYt ++1UEiuGgNI+7mtayMrMTmkPAH//v8b4JfyHSFOcMIFvQGd8Lf8/nl0sdhB/eVAKGxSYtRvE ++65cjw6U9afG+wyNkISHAtOXB2g4HTbwHRSsq5451z8kbMlSMufKoaI7NlWXtiStjgXA2TI ++4b/5STOu15kfnEDWrW0uUQkWodKZqvr+p1fbvM8ijysA8rfqCgqSu9XMaQYNeqn2p7Exp5 ++dsZBpE6gkNJjgHkhgUeBHtvkQmnXaj87kPkDOL2gnvWzVEnZiUBQZgL1O9Z3Qr0+PuSrkh ++QIwPO0umkWA4qRkd4vh1SAg/vyOeDgdAxmcHm3So2IxOKQnBmWBIgsxkaei4d2yUvqLhmY ++9dbjgNZnyh81Rf2bkYPvnUhf1anKyxyRcbybQMdGJS4u3J7RO246+VbpPDvDm7cL5wbGol ++Q9Y8O2PciUoksK03RCdyeoKpJ2VdAvve5TyNs0aLYmpemYyl7rA7s4STR/gSWzBRPYWxbI ++Znmynq4dXIf58Nj4+TpgQkxQwxM= ++-----END OPENSSH PRIVATE KEY----- ++"""; ++ ++private void test_key_parse_private_key_pw_protected() { ++ var input = new MemoryInputStream.from_data(PRIVATE_KEY_PW_PROTECTED.data); ++ ++ var mainloop = new GLib.MainLoop(); ++ Seahorse.Ssh.Key.parse.begin(input, null, (obj, res) => { ++ try { ++ var parse_result = Seahorse.Ssh.Key.parse.end(res); ++ assert_true(parse_result.public_keys.length == 0); ++ ++ assert_true(parse_result.secret_keys.length == 1); ++ unowned var secdata = parse_result.secret_keys[0]; ++ assert_null(secdata.comment); ++ assert_true(secdata.algo == Seahorse.Ssh.Algorithm.RSA); ++ } catch (Error err) { ++ error("Couldn't parse private key: %s", err.message); ++ } finally { ++ mainloop.quit(); ++ } ++ }); ++ mainloop.run(); ++} diff --git a/system/seahorse/patches/seahorse-ssh-return-type.patch b/system/seahorse/patches/seahorse-ssh-return-type.patch new file mode 100644 index 0000000000..5faa34d923 --- /dev/null +++ b/system/seahorse/patches/seahorse-ssh-return-type.patch @@ -0,0 +1,25 @@ +From 0fffa8a708c421b019dba3f92ad802d02e86495d Mon Sep 17 00:00:00 2001 +From: ppw 0 +Date: Wed, 6 Dec 2023 12:16:45 +0000 +Subject: [PATCH] Update file operation.vala + +--- + ssh/operation.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ssh/operation.vala b/ssh/operation.vala +index 4743d0a5..48a525c3 100644 +--- a/ssh/operation.vala ++++ b/ssh/operation.vala +@@ -49,7 +49,7 @@ public abstract class Operation : GLib.Object { + protected async string? operation_async(string command, + string? input, + Cancellable? cancellable) throws GLib.Error { +- return_val_if_fail (command != null && command != "", null); ++ return_val_if_fail (command != null && command != "", false); + + // Strip the command name for logging purposes + string[] args; +-- +GitLab + diff --git a/system/seahorse/seahorse.SlackBuild b/system/seahorse/seahorse.SlackBuild index 56e3065951..465979e345 100644 --- a/system/seahorse/seahorse.SlackBuild +++ b/system/seahorse/seahorse.SlackBuild @@ -8,7 +8,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=seahorse -VERSION=${VERSION:-3.18.0} +VERSION=${VERSION:-43.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -62,29 +62,33 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG +for i in $CWD/patches/*.patch ; do + patch -p1 < $i +done + +mkdir build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + -Dstrip=true + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING* INSTALL MAINTAINERS NEWS README THANKS TODO \ + COPYING* NEWS README.md THANKS \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/seahorse/seahorse.info b/system/seahorse/seahorse.info index 39a0da1d79..d25073297a 100644 --- a/system/seahorse/seahorse.info +++ b/system/seahorse/seahorse.info @@ -1,8 +1,8 @@ PRGNAM="seahorse" -VERSION="3.18.0" +VERSION="43.0" HOMEPAGE="http://projects.gnome.org/seahorse/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.18/seahorse-3.18.0.tar.xz" -MD5SUM="758204ac248e1fb3b3767ce84d2795b4" +DOWNLOAD="https://download.gnome.org/sources/seahorse/43/seahorse-43.0.tar.xz" +MD5SUM="efa9fea2e1c4291c39d509eb366b9a56" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/spacefm/patches/gcc10.patch b/system/spacefm/patches/gcc10.patch new file mode 100644 index 0000000000..1e8c1e52d7 --- /dev/null +++ b/system/spacefm/patches/gcc10.patch @@ -0,0 +1,92 @@ +https://github.com/IgnorantGuru/spacefm/issues/770 + +diff --git a/src/settings.c b/src/settings.c +index 280196f..9d8e880 100644 +--- a/src/settings.c ++++ b/src/settings.c +@@ -52,6 +52,24 @@ + /* Dirty hack: check whether we are under LXDE or not */ + #define is_under_LXDE() (g_getenv( "_LXSESSION_PID" ) != NULL) + ++/* GCC 10.1+ */ ++char* settings_terminal_su = NULL; ++char* settings_graphical_su = NULL; ++GList* xset_cmd_history = NULL; ++XSet* evt_win_focus = NULL; ++XSet* evt_win_move = NULL; ++XSet* evt_win_click = NULL; ++XSet* evt_win_key = NULL; ++XSet* evt_win_close = NULL; ++XSet* evt_pnl_show = NULL; ++XSet* evt_pnl_focus = NULL; ++XSet* evt_pnl_sel = NULL; ++XSet* evt_tab_new = NULL; ++XSet* evt_tab_chdir = NULL; ++XSet* evt_tab_focus = NULL; ++XSet* evt_tab_close = NULL; ++XSet* evt_device = NULL; ++ + AppSettings app_settings = {0}; + /* const gboolean singleInstance_default = TRUE; */ + const gboolean show_hidden_files_default = FALSE; +diff --git a/src/settings.h b/src/settings.h +index 07419b8..4591d48 100644 +--- a/src/settings.h ++++ b/src/settings.h +@@ -130,7 +130,7 @@ const char* xset_get_user_tmp_dir(); + /////////////////////////////////////////////////////////////////////////////// + //MOD extra settings below + +-GList* xsets; ++extern GList* xsets; + + enum { + XSET_B_UNSET, +@@ -333,22 +333,22 @@ typedef struct + } XMenuItem; + + // cache these for speed in event handlers +-XSet* evt_win_focus; +-XSet* evt_win_move; +-XSet* evt_win_click; +-XSet* evt_win_key; +-XSet* evt_win_close; +-XSet* evt_pnl_show; +-XSet* evt_pnl_focus; +-XSet* evt_pnl_sel; +-XSet* evt_tab_new; +-XSet* evt_tab_chdir; +-XSet* evt_tab_focus; +-XSet* evt_tab_close; +-XSet* evt_device; ++extern XSet* evt_win_focus; ++extern XSet* evt_win_move; ++extern XSet* evt_win_click; ++extern XSet* evt_win_key; ++extern XSet* evt_win_close; ++extern XSet* evt_pnl_show; ++extern XSet* evt_pnl_focus; ++extern XSet* evt_pnl_sel; ++extern XSet* evt_tab_new; ++extern XSet* evt_tab_chdir; ++extern XSet* evt_tab_focus; ++extern XSet* evt_tab_close; ++extern XSet* evt_device; + + // instance-wide command history +-GList* xset_cmd_history; ++extern GList* xset_cmd_history; + + static const char* terminal_programs[] = //for pref-dialog.c + { +@@ -396,8 +396,8 @@ static const char* gsu_commands[] = // order and contents must match prefdlg.ui + }; + + // These will contain the su and gsu settings from /etc/spacefm/spacefm.conf +-char* settings_terminal_su; +-char* settings_graphical_su; ++extern char* settings_terminal_su; ++extern char* settings_graphical_su; + + typedef struct + { diff --git a/system/spacefm/patches/glibc-2.28.patch b/system/spacefm/patches/glibc-2.28.patch new file mode 100644 index 0000000000..324bc43b93 --- /dev/null +++ b/system/spacefm/patches/glibc-2.28.patch @@ -0,0 +1,12 @@ +diff --git a/src/main.c b/src/main.c +index 645e2ec..9453a3b 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include + diff --git a/system/spacefm/patches/spacefm-1.0.6-c23-bool-keyword.patch b/system/spacefm/patches/spacefm-1.0.6-c23-bool-keyword.patch new file mode 100644 index 0000000000..7d60339304 --- /dev/null +++ b/system/spacefm/patches/spacefm-1.0.6-c23-bool-keyword.patch @@ -0,0 +1,119 @@ +commit 52260c8dbc45c4493aea6e458f486a18f7ff8b96 +Author: Mamoru TASAKA +Date: Tue Jan 21 16:10:54 2025 +0900 + + second + +diff --git a/src/main-window.c b/src/main-window.c +index 574a75f..45b8ecd 100644 +--- a/src/main-window.c ++++ b/src/main-window.c +@@ -6250,7 +6250,7 @@ GtkWidget* main_task_view_new( FMMainWindow* main_window ) + + // ============== socket commands + +-gboolean bool( const char* value ) ++gboolean truthy( const char* value ) + { + return ( !( value && value[0] ) || !strcmp( value, "1") || + !strcmp( value, "true") || +@@ -6441,14 +6441,14 @@ _missing_arg: + } + else if ( !strcmp( argv[i], "window_maximized" ) ) + { +- if ( bool( argv[i+1] ) ) ++ if ( truthy( argv[i+1] ) ) + gtk_window_maximize( GTK_WINDOW( main_window ) ); + else + gtk_window_unmaximize( GTK_WINDOW( main_window ) ); + } + else if ( !strcmp( argv[i], "window_fullscreen" ) ) + { +- xset_set_b( "main_full", bool( argv[i+1] ) ); ++ xset_set_b( "main_full", truthy( argv[i+1] ) ); + on_fullscreen_activate( NULL, main_window ); + } + else if ( !strcmp( argv[i], "screen_size" ) ) +@@ -6591,7 +6591,7 @@ _missing_arg: + argv[i] ); + return 2; + } +- xset_set_b_panel( j, "show", bool( argv[i+1] ) ); ++ xset_set_b_panel( j, "show", truthy( argv[i+1] ) ); + show_panels_all_windows( NULL, main_window ); + return 0; + } +@@ -6602,9 +6602,9 @@ _missing_arg: + if ( use_mode ) + xset_set_b_panel_mode( panel, str, + main_window->panel_context[panel-1], +- bool( argv[i+1] ) ); ++ truthy( argv[i+1] ) ); + else +- xset_set_b_panel( panel, str, bool( argv[i+1] ) ); ++ xset_set_b_panel( panel, str, truthy( argv[i+1] ) ); + update_views_all_windows( NULL, file_browser ); + } + else if ( !strcmp( argv[i], "panel_hslider_top" ) || +@@ -6709,23 +6709,23 @@ _missing_arg: + { + if ( !strcmp( argv[i] + 5, "ascend" ) ) + { +- ptk_file_browser_set_sort_type( file_browser, bool( argv[i+1] ) ? ++ ptk_file_browser_set_sort_type( file_browser, truthy( argv[i+1] ) ? + GTK_SORT_ASCENDING : GTK_SORT_DESCENDING ); + return 0; + } + else if ( !strcmp( argv[i] + 5, "natural" ) ) + { + str = "sortx_natural"; +- xset_set_b( str, bool( argv[i+1] ) ); ++ xset_set_b( str, truthy( argv[i+1] ) ); + } + else if ( !strcmp( argv[i] + 5, "case" ) ) + { + str = "sortx_case"; +- xset_set_b( str, bool( argv[i+1] ) ); ++ xset_set_b( str, truthy( argv[i+1] ) ); + } + else if ( !strcmp( argv[i] + 5, "hidden_first" ) ) + { +- str = bool( argv[i+1] ) ? "sortx_hidfirst" : "sortx_hidlast"; ++ str = truthy( argv[i+1] ) ? "sortx_hidfirst" : "sortx_hidlast"; + xset_set_b( str, TRUE ); + } + else if ( !strcmp( argv[i] + 5, "first" ) ) +@@ -6748,7 +6748,7 @@ _missing_arg: + } + else if ( !strcmp( argv[i], "show_thumbnails" ) ) + { +- if ( app_settings.show_thumbnail != bool( argv[i+1] ) ) ++ if ( app_settings.show_thumbnail != truthy( argv[i+1] ) ) + main_window_toggle_thumbnails_all_windows(); + } + else if ( !strcmp( argv[i], "large_icons" ) ) +@@ -6757,7 +6757,7 @@ _missing_arg: + { + xset_set_b_panel_mode( panel, "list_large", + main_window->panel_context[panel-1], +- bool( argv[i+1] ) ); ++ truthy( argv[i+1] ) ); + update_views_all_windows( NULL, file_browser ); + } + } +diff --git a/src/settings.c b/src/settings.c +index e405af8..07e0fa4 100644 +--- a/src/settings.c ++++ b/src/settings.c +@@ -2731,9 +2731,9 @@ gboolean xset_get_bool( const char* name, const char* var ) + gboolean xset_get_bool_panel( int panel, const char* name, const char* var ) + { + char* fullname = g_strdup_printf( "panel%d_%s", panel, name ); +- gboolean bool = xset_get_bool( fullname, var ); ++ gboolean truthy = xset_get_bool( fullname, var ); + g_free( fullname ); +- return bool; ++ return truthy; + } + + int xset_get_int_set( XSet* set, const char* var ) diff --git a/system/spacefm/patches/spacefm-1.0.6-c23-function-proto.patch b/system/spacefm/patches/spacefm-1.0.6-c23-function-proto.patch new file mode 100644 index 0000000000..7fd4c67b73 --- /dev/null +++ b/system/spacefm/patches/spacefm-1.0.6-c23-function-proto.patch @@ -0,0 +1,215 @@ +commit 86364a17a3146e23a52fcf86f748dd99b3b1cf93 +Author: Mamoru TASAKA +Date: Tue Jan 21 16:10:30 2025 +0900 + + first + +diff --git a/src/cust-dialog.c b/src/cust-dialog.c +index 38252ee..59b88d2 100644 +--- a/src/cust-dialog.c ++++ b/src/cust-dialog.c +@@ -3806,7 +3806,7 @@ static void show_help() + fprintf( f, " %s\n\n", DEFAULT_MANUAL ); + } + +-void signal_handler() ++void signal_handler(int signal) + { + if ( signal_dialog ) + { +diff --git a/src/ptk/ptk-dir-tree-view.c b/src/ptk/ptk-dir-tree-view.c +index 5781084..8b96435 100644 +--- a/src/ptk/ptk-dir-tree-view.c ++++ b/src/ptk/ptk-dir-tree-view.c +@@ -357,7 +357,7 @@ GtkTreeModel* get_dir_tree_model() + + if ( G_UNLIKELY( ! dir_tree_model ) ) + { +- dir_tree_model = ptk_dir_tree_new( TRUE ); ++ dir_tree_model = ptk_dir_tree_new(); + g_object_add_weak_pointer( G_OBJECT( dir_tree_model ), + ( gpointer * ) (GtkWidget *) & dir_tree_model ); + } +diff --git a/src/ptk/ptk-file-misc.c b/src/ptk/ptk-file-misc.c +index a15c72b..72425ef 100644 +--- a/src/ptk/ptk-file-misc.c ++++ b/src/ptk/ptk-file-misc.c +@@ -1338,7 +1338,7 @@ void on_opt_toggled( GtkMenuItem* item, MoveSet* mset ) + void on_toggled( GtkMenuItem* item, MoveSet* mset ) + { + //int (*show) () = NULL; +- void (*show) () = NULL; ++ void (*show) (GtkWidget *) = NULL; + gboolean someone_is_visible = FALSE; + gboolean opts_visible = FALSE; + +@@ -1406,54 +1406,54 @@ void on_toggled( GtkMenuItem* item, MoveSet* mset ) + // entries + if ( xset_get_b( "move_name" ) ) + { +- show = (GFunc)gtk_widget_show; ++ show = gtk_widget_show; + someone_is_visible = TRUE; + } + else +- show = (GFunc)gtk_widget_hide; +- show( mset->label_name ); ++ show = gtk_widget_hide; ++ show( GTK_WIDGET(mset->label_name) ); + show( mset->scroll_name ); + show( mset->hbox_ext ); +- show( mset->blank_name ); ++ show( GTK_WIDGET(mset->blank_name) ); + + if ( xset_get_b( "move_filename" ) ) + { +- show = (GFunc)gtk_widget_show; ++ show = gtk_widget_show; + someone_is_visible = TRUE; + } + else +- show = (GFunc)gtk_widget_hide; +- show( mset->label_full_name ); ++ show = gtk_widget_hide; ++ show( GTK_WIDGET(mset->label_full_name) ); + show( mset->scroll_full_name ); +- show( mset->blank_full_name ); ++ show( GTK_WIDGET(mset->blank_full_name) ); + + if ( xset_get_b( "move_parent" ) ) + { +- show = (GFunc)gtk_widget_show; ++ show = gtk_widget_show; + someone_is_visible = TRUE; + } + else +- show = (GFunc)gtk_widget_hide; +- show( mset->label_path ); ++ show = gtk_widget_hide; ++ show( GTK_WIDGET(mset->label_path) ); + show( mset->scroll_path ); +- show( mset->blank_path ); ++ show( GTK_WIDGET(mset->blank_path) ); + + if ( xset_get_b( "move_path" ) ) + { +- show = (GFunc)gtk_widget_show; ++ show = gtk_widget_show; + someone_is_visible = TRUE; + } + else +- show = (GFunc)gtk_widget_hide; +- show( mset->label_full_path ); ++ show = gtk_widget_hide; ++ show( GTK_WIDGET(mset->label_full_path) ); + show( mset->scroll_full_path ); + + if ( !mset->is_link && !mset->create_new && xset_get_b( "move_type" ) ) + { +- show = (GFunc)gtk_widget_show; ++ show = gtk_widget_show; + } + else +- show = (GFunc)gtk_widget_hide; ++ show = gtk_widget_hide; + show( mset->hbox_type ); + + gboolean new_file = FALSE; +@@ -1468,15 +1468,15 @@ void on_toggled( GtkMenuItem* item, MoveSet* mset ) + + if ( new_link || ( mset->is_link && xset_get_b( "move_target" ) ) ) + { +- show = (GFunc)gtk_widget_show; ++ show = gtk_widget_show; + } + else +- show = (GFunc)gtk_widget_hide; ++ show = gtk_widget_hide; + show( mset->hbox_target ); + + if ( ( new_file || new_folder ) && xset_get_b( "move_template" ) ) + { +- show = (GFunc)gtk_widget_show; ++ show = gtk_widget_show; + if ( new_file ) + { + gtk_widget_show( GTK_WIDGET( mset->combo_template ) ); +@@ -1493,7 +1493,7 @@ void on_toggled( GtkMenuItem* item, MoveSet* mset ) + } + } + else +- show = (GFunc)gtk_widget_hide; ++ show = gtk_widget_hide; + show( mset->hbox_template ); + + if ( !someone_is_visible ) +diff --git a/src/settings.c b/src/settings.c +index 9c4522c..e405af8 100644 +--- a/src/settings.c ++++ b/src/settings.c +@@ -2987,7 +2987,7 @@ void xset_parse( char* line ) + } + } + +-XSet* xset_set_cb( const char* name, void (*cb_func) (), gpointer cb_data ) ++XSet* xset_set_cb_internal( const char* name, void (*cb_func) (GtkWidget*, gpointer), gpointer cb_data ) + { + XSet* set = xset_get( name ); + set->cb_func = cb_func; +@@ -2995,10 +2995,10 @@ XSet* xset_set_cb( const char* name, void (*cb_func) (), gpointer cb_data ) + return set; + } + +-XSet* xset_set_cb_panel( int panel, const char* name, void (*cb_func) (), gpointer cb_data ) ++XSet* xset_set_cb_panel_internal( int panel, const char* name, void (*cb_func) (GtkWidget*, gpointer), gpointer cb_data ) + { + char* fullname = g_strdup_printf( "panel%d_%s", panel, name ); +- XSet* set = xset_set_cb( fullname, cb_func, cb_data ); ++ XSet* set = xset_set_cb_internal( fullname, cb_func, cb_data ); + g_free( fullname ); + return set; + } +@@ -8587,7 +8587,7 @@ gboolean xset_menu_keypress( GtkWidget* widget, GdkEventKey* event, + void xset_menu_cb( GtkWidget* item, XSet* set ) + { + GtkWidget* parent; +- void (*cb_func) () = NULL; ++ void (*cb_func) (GtkWidget*, gpointer) = NULL; + gpointer cb_data = NULL; + char* title; + XSet* mset; // mirror set or set +diff --git a/src/settings.h b/src/settings.h +index e608ebf..5dcc201 100644 +--- a/src/settings.h ++++ b/src/settings.h +@@ -261,7 +261,7 @@ typedef struct + char* menu_label; + int menu_style; // not saved or read if locked + char* icon; +- void (*cb_func) (); // not saved ++ void (*cb_func) (GtkWidget*, gpointer); // not saved + gpointer cb_data; // not saved + char* ob1; // not saved + gpointer ob1_data; // not saved +@@ -415,7 +415,9 @@ XSet* xset_set_b_panel( int panel, const char* name, gboolean bval ); + int xset_get_int( const char* name, const char* var ); + int xset_get_int_panel( int panel, const char* name, const char* var ); + XSet* xset_set_panel( int panel, const char* name, const char* var, const char* value ); +-XSet* xset_set_cb_panel( int panel, const char* name, void (*cb_func) (), gpointer cb_data ); ++XSet* xset_set_cb_panel_internal( int panel, const char* name, void (*cb_func) (GtkWidget*, gpointer), gpointer cb_data ); ++#define xset_set_cb_panel(panel, name, cb_func, cb_data) \ ++ xset_set_cb_panel_internal(panel, name, (void(*)(GtkWidget*, gpointer))(cb_func), cb_data) + gboolean xset_get_b_set( XSet* set ); + XSet* xset_get_panel_mode( int panel, const char* name, char mode ); + gboolean xset_get_b_panel_mode( int panel, const char* name, char mode ); +@@ -450,7 +452,9 @@ GtkWidget* xset_add_menuitem( DesktopWindow* desktop, PtkFileBrowser* file_brows + GtkWidget* menu, GtkAccelGroup *accel_group, + XSet* set ); + GtkWidget* xset_get_image( const char* icon, int icon_size ); +-XSet* xset_set_cb( const char* name, void (*cb_func) (), gpointer cb_data ); ++XSet* xset_set_cb_internal( const char* name, void (*cb_func) (GtkWidget*, gpointer), gpointer cb_data ); ++#define xset_set_cb(name, cb_func, cb_data) \ ++ xset_set_cb_internal(name, (void(*)(GtkWidget*, gpointer))(cb_func), cb_data) + XSet* xset_set_ob1_int( XSet* set, const char* ob1, int ob1_int ); + XSet* xset_set_ob1( XSet* set, const char* ob1, gpointer ob1_data ); + XSet* xset_set_ob2( XSet* set, const char* ob2, gpointer ob2_data ); diff --git a/system/spacefm/patches/spacefm-1.0.6-c99-type-cast.patch b/system/spacefm/patches/spacefm-1.0.6-c99-type-cast.patch new file mode 100644 index 0000000000..2c87ed4ce7 --- /dev/null +++ b/system/spacefm/patches/spacefm-1.0.6-c99-type-cast.patch @@ -0,0 +1,57 @@ +diff --git a/src/exo/exo-gdk-pixbuf-extensions.c b/src/exo/exo-gdk-pixbuf-extensions.c +index 0dd74c2..7fb9910 100644 +--- a/src/exo/exo-gdk-pixbuf-extensions.c ++++ b/src/exo/exo-gdk-pixbuf-extensions.c +@@ -492,7 +492,7 @@ exo_gdk_pixbuf_scale_down (GdkPixbuf *source, + + /* check if we need to scale */ + if (G_UNLIKELY (source_width <= dest_width && source_height <= dest_height)) +- return g_object_ref (G_OBJECT (source)); ++ return g_object_ref (source); + + /* check if aspect ratio should be preserved */ + if (G_LIKELY (preserve_aspect_ratio)) +diff --git a/src/exo/exo-icon-chooser-model.c b/src/exo/exo-icon-chooser-model.c +index 5cd03ef..792c571 100644 +--- a/src/exo/exo-icon-chooser-model.c ++++ b/src/exo/exo-icon-chooser-model.c +@@ -671,7 +671,7 @@ _exo_icon_chooser_model_get_for_icon_theme (GtkIconTheme *icon_theme) + g_object_set_data (G_OBJECT (icon_theme), "exo-icon-chooser-default-model", model); + + /* associated the model with the icon theme */ +- model->icon_theme = g_object_ref (G_OBJECT (icon_theme)); ++ model->icon_theme = g_object_ref (icon_theme); + exo_icon_chooser_model_icon_theme_changed (icon_theme, model); + g_signal_connect (G_OBJECT (icon_theme), "changed", G_CALLBACK (exo_icon_chooser_model_icon_theme_changed), model); + } +diff --git a/src/exo/exo-icon-view.c b/src/exo/exo-icon-view.c +index 4d86068..3a860ea 100644 +--- a/src/exo/exo-icon-view.c ++++ b/src/exo/exo-icon-view.c +@@ -2683,7 +2683,7 @@ exo_icon_view_key_press_event (GtkWidget *widget, + /* allocate a new event to forward */ + new_event = gdk_event_copy ((GdkEvent *) event); + g_object_unref (G_OBJECT (new_event->key.window)); +- new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (GTK_WIDGET(icon_view->priv->search_entry)))); ++ new_event->key.window = g_object_ref (gtk_widget_get_window (GTK_WIDGET(icon_view->priv->search_entry))); + + /* send the event to the search entry. If the "preedit-changed" signal is + * emitted during this event, priv->search_imcontext_changed will be set. +@@ -3082,7 +3082,7 @@ exo_icon_view_set_hadjustment (ExoIconView *icon_view, + if (!hadj) + hadj = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + +- icon_view->priv->hadjustment = g_object_ref_sink (G_OBJECT (hadj)); ++ icon_view->priv->hadjustment = g_object_ref_sink (hadj); + + g_signal_connect (icon_view->priv->hadjustment, "value-changed", + G_CALLBACK (exo_icon_view_adjustment_changed), +@@ -3109,7 +3109,7 @@ exo_icon_view_set_vadjustment (ExoIconView *icon_view, + if (!vadj) + vadj = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + +- icon_view->priv->vadjustment = g_object_ref_sink (G_OBJECT (vadj)); ++ icon_view->priv->vadjustment = g_object_ref_sink (vadj); + + g_signal_connect (icon_view->priv->vadjustment, "value-changed", + G_CALLBACK (exo_icon_view_adjustment_changed), diff --git a/system/spacefm/spacefm.SlackBuild b/system/spacefm/spacefm.SlackBuild index 72708b0a0c..fa61be9c5f 100644 --- a/system/spacefm/spacefm.SlackBuild +++ b/system/spacefm/spacefm.SlackBuild @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -92,9 +89,13 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # https://github.com/IgnorantGuru/spacefm/issues/727 -patch -p1 < $CWD/glibc-2.28.patch +patch -p1 < $CWD/patches/glibc-2.28.patch # https://github.com/IgnorantGuru/spacefm/issues/770 -patch -p1 < $CWD/gcc10.patch +patch -p1 < $CWD/patches/gcc10.patch +# new compilers support (patches from fedora) +patch -p1 < $CWD/patches/spacefm-1.0.6-c99-type-cast.patch +patch -p1 < $CWD/patches/spacefm-1.0.6-c23-bool-keyword.patch +patch -p1 < $CWD/patches/spacefm-1.0.6-c23-function-proto.patch CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/stow/README b/system/stow/README deleted file mode 100644 index c56e6bfac2..0000000000 --- a/system/stow/README +++ /dev/null @@ -1,13 +0,0 @@ -GNU Stow is a symlink farm manager which takes distinct packages of -software and/or data located in separate directories on the -filesystem, and makes them appear to be installed in the same place. - -This is particularly useful for keeping track of system-wide and -per-user installations of software built from source, but can also -facilitate a more controlled approach to management of configuration -files in the user's home directory, especially when coupled with -version control systems. - -Stow is implemented as a combination of a Perl script providing a CLI -interface, and a backend Perl module which does most of the work. Stow -is Free Software, licensed under the GNU General Public License. diff --git a/system/stow/slack-desc b/system/stow/slack-desc deleted file mode 100644 index 694ec415d7..0000000000 --- a/system/stow/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -stow: stow (manage source installs) -stow: -stow: GNU Stow is a symlink farm manager which takes distinct packages of -stow: software and/or data located in separate directories on the -stow: filesystem, and makes them appear to be installed in the same place. -stow: -stow: This is particularly useful for keeping track of system-wide and -stow: per-user installations of software built from source, but can also -stow: facilitate a more controlled approach to management of configuration -stow: files in the user's home directory, especially when coupled with -stow: version control systems. diff --git a/system/stow/stow.SlackBuild b/system/stow/stow.SlackBuild deleted file mode 100644 index 64b4d89388..0000000000 --- a/system/stow/stow.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -# Slackware build script for stow - -# Copyright 2018, 2019 Pedro R.M. Júnior, Campinas, SP, 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=stow -VERSION=${VERSION:-2.3.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux -make -make install-strip DESTDIR=$PKG - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mv $PKG/usr/share/info $PKG/usr/ # move info dir to usual place for Slackware -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/*.info* - -cp -a \ - AUTHORS COPYING ChangeLog INSTALL.md NEWS README.md THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/stow/stow.info b/system/stow/stow.info deleted file mode 100644 index 2b4c944068..0000000000 --- a/system/stow/stow.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="stow" -VERSION="2.3.1" -HOMEPAGE="https://www.gnu.org/software/stow" -DOWNLOAD="https://ftp.gnu.org/gnu/stow/stow-2.3.1.tar.bz2" -MD5SUM="d18bea2eb6369f52af8cdb9c91bc93ac" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Pedro R.M. Júnior" -EMAIL="pedrormjunior@gmail.com" diff --git a/system/tini/tini.SlackBuild b/system/tini/tini.SlackBuild index 960a313691..0fd9a7299e 100644 --- a/system/tini/tini.SlackBuild +++ b/system/tini/tini.SlackBuild @@ -91,6 +91,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DPR_SET_CHILD_SUBREAPER=36 \ -DPR_GET_CHILD_SUBREAPER=37 \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/system/tp_smapi/tp_smapi.SlackBuild b/system/tp_smapi/tp_smapi.SlackBuild index 1056545e07..5868a221c8 100644 --- a/system/tp_smapi/tp_smapi.SlackBuild +++ b/system/tp_smapi/tp_smapi.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tp_smapi -VERSION=${VERSION:-0.43} +VERSION=${VERSION:-0.45} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/tp_smapi/tp_smapi.info b/system/tp_smapi/tp_smapi.info index dcbd1ef5b8..b007c5a215 100644 --- a/system/tp_smapi/tp_smapi.info +++ b/system/tp_smapi/tp_smapi.info @@ -1,8 +1,8 @@ PRGNAM="tp_smapi" -VERSION="0.43" +VERSION="0.45" HOMEPAGE="https://github.com/evgeni/tp_smapi" -DOWNLOAD="https://github.com/evgeni/tp_smapi/archive/tp-smapi/0.43/tp_smapi-tp-smapi-0.43.tar.gz" -MD5SUM="0e8dfb8af5b2cf361bb74e9ffef60f87" +DOWNLOAD="https://github.com/evgeni/tp_smapi/archive/tp-smapi/0.45/tp_smapi-tp-smapi-0.45.tar.gz" +MD5SUM="88fc903b0e396a60b17b909f3732e26a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/trrntzip/slack-desc b/system/trrntzip/slack-desc index eecb353ad1..ae8002db6d 100644 --- a/system/trrntzip/slack-desc +++ b/system/trrntzip/slack-desc @@ -15,5 +15,5 @@ trrntzip: trrntzip: trrntzip: trrntzip: -trrntzip: https://sourceforge.net/projects/trrntzip/ +trrntzip: https://github.com/0-wiz-0/trrntzip/ trrntzip: diff --git a/system/trrntzip/trrntzip.SlackBuild b/system/trrntzip/trrntzip.SlackBuild index 1a8fa43f80..2e59a1dd86 100644 --- a/system/trrntzip/trrntzip.SlackBuild +++ b/system/trrntzip/trrntzip.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=trrntzip -VERSION=${VERSION:-v02} +VERSION=${VERSION:-1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -64,9 +64,9 @@ set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM -tar xvf $CWD/${PRGNAM}_${VERSION}_src.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 \ @@ -74,20 +74,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# A small patch to fix a permissions issue: -patch -p1 < $CWD/trrntzip_permission_fix.diff - -./autogen.sh -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr - -make -make install-strip DESTDIR=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/trrntzip/trrntzip.info b/system/trrntzip/trrntzip.info index 7858763586..e5af1235a9 100644 --- a/system/trrntzip/trrntzip.info +++ b/system/trrntzip/trrntzip.info @@ -1,8 +1,8 @@ PRGNAM="trrntzip" -VERSION="v02" -HOMEPAGE="https://sourceforge.net/projects/trrntzip/" -DOWNLOAD="https://downloads.sourceforge.net/trrntzip/trrntzip_v02_src.tar.gz" -MD5SUM="2635a4042b3cf5611ffdffb4019ec8b7" +VERSION="1.3" +HOMEPAGE="https://github.com/0-wiz-0/trrntzip/" +DOWNLOAD="https://github.com/0-wiz-0/trrntzip/archive/v1.3/trrntzip-1.3.tar.gz" +MD5SUM="712ebea3daf181bce4c67473bafed513" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/uhd/uhd.SlackBuild b/system/uhd/uhd.SlackBuild index 54aa0051ed..5e8171fa21 100644 --- a/system/uhd/uhd.SlackBuild +++ b/system/uhd/uhd.SlackBuild @@ -85,6 +85,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 {} \+ +# fix building with gcc >= 13.x +sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./include/uhd/cal/database.hpp +sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./include/uhd/rfnoc/defaults.hpp +sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./lib/usrp/dboard/magnesium/magnesium_constants.hpp +sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./lib/usrp/dboard/rhodium/rhodium_constants.hpp +sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./include/uhd/types/eeprom.hpp +sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./lib/include/uhdlib/utils/serial_number.hpp +sed -i s/\#include\ "cast.h"/\#include\ "cast.h"\\n\#include\ \/ ./lib/deps/pybind11/include/pybind11/attr.h + mkdir -p build cd build cmake \ diff --git a/system/usbtop/usbtop.SlackBuild b/system/usbtop/usbtop.SlackBuild index add63cf17f..7f00c4c609 100644 --- a/system/usbtop/usbtop.SlackBuild +++ b/system/usbtop/usbtop.SlackBuild @@ -83,6 +83,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG diff --git a/system/veracrypt/32bit.patch b/system/veracrypt/32bit.patch new file mode 100644 index 0000000000..b5d78d2578 --- /dev/null +++ b/system/veracrypt/32bit.patch @@ -0,0 +1,23 @@ +diff -Naur veracrypt-1.26.7.orig/src/Common/PCSCException.cpp veracrypt-1.26.7/src/Common/PCSCException.cpp +--- veracrypt-1.26.7.orig/src/Common/PCSCException.cpp 2023-10-01 18:52:55.000000000 +0200 ++++ veracrypt-1.26.7/src/Common/PCSCException.cpp 2024-06-04 10:00:30.424227000 +0200 +@@ -140,14 +140,17 @@ + { + Exception::Deserialize(stream); + Serializer sr(stream); +- sr.Deserialize("ErrorCode", ErrorCode); ++ int64 v; ++ sr.Deserialize("ErrorCode", v); ++ ErrorCode = (LONG_PCSC)v; + } + + void PCSCException::Serialize(shared_ptr stream) const + { + Exception::Serialize(stream); + Serializer sr(stream); +- sr.Serialize("ErrorCode", ErrorCode); ++ int64 v = (int64)ErrorCode; ++ sr.Serialize("ErrorCode", v); + } + + # define TC_EXCEPTION(TYPE) TC_SERIALIZER_FACTORY_ADD(TYPE) diff --git a/system/veracrypt/veracrypt.SlackBuild b/system/veracrypt/veracrypt.SlackBuild index 530c4fa8fb..dc6dd166c3 100644 --- a/system/veracrypt/veracrypt.SlackBuild +++ b/system/veracrypt/veracrypt.SlackBuild @@ -32,8 +32,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=veracrypt -VERSION=${VERSION:-1.25.7} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.26.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -85,12 +85,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 {} \+ +# https://sourceforge.net/p/veracrypt/discussion/general/thread/a8003fa49c/#3eae +if [[ $(uname -m) =~ i*86 ]]; then patch -p1 < $CWD/32bit.patch ; fi + cd src -make WX_CONFIG=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0 +make WX_CONFIG=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.2 make package cp -av Setup/Linux/usr $PKG rm -f $PKG/usr/bin/veracrypt-uninstall.sh +make clean +make NOGUI=1 +install -m0755 Main/${PRGNAM} $PKG/usr/bin/${PRGNAM}-nox + find $PKG -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/veracrypt/veracrypt.info b/system/veracrypt/veracrypt.info index 7d86631c14..5682764804 100644 --- a/system/veracrypt/veracrypt.info +++ b/system/veracrypt/veracrypt.info @@ -1,10 +1,10 @@ PRGNAM="veracrypt" -VERSION="1.25.7" +VERSION="1.26.7" HOMEPAGE="https://www.veracrypt.fr/" -DOWNLOAD="https://launchpad.net/veracrypt/trunk/1.25.7/+download/VeraCrypt_1.25.7_Source.tar.bz2" -MD5SUM="0a874ac3d109974de33cf10c9860b03f" +DOWNLOAD="https://launchpad.net/veracrypt/trunk/1.26.7/+download/VeraCrypt_1.26.7_Source.tar.bz2" +MD5SUM="014748dc89e9e31351cff984bc8b9386" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="wxGTK3 makeself" +REQUIRES="wxWidgets makeself" MAINTAINER="Thomas Szteliga" EMAIL="ts@websafe.pl" diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index c106ab9041..ff7d4b801f 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -172,14 +172,14 @@ config() { # at all. # 20230504 bkw: note to self: -w means disable all warnings. - CFLAGS="$SLKCFLAGS -w -fcommon" \ + CFLAGS="$SLKCFLAGS -w -fcommon -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ DOS2UNIX=/bin/true \ XA=/bin/true \ XDG_DESKTOP_MENU=/bin/true \ ./configure \ $configarg \ - $ffmpeg \ + --disable-ffmpeg \ $pulseopt \ --enable-html-docs \ --enable-platformdox \ diff --git a/system/vinterm/includes.diff b/system/vinterm/includes.diff new file mode 100644 index 0000000000..28b9096c59 --- /dev/null +++ b/system/vinterm/includes.diff @@ -0,0 +1,10 @@ +--- vinterm-0.5.0/terminal/pty.h 2013-08-20 01:34:06.000000000 +0900 ++++ vinterm-0.5.0.patched/terminal/pty.h 2023-07-01 09:41:53.057899502 +0900 +@@ -3,6 +3,7 @@ + + #include + #include ++#include + using namespace std; + + class Options; diff --git a/system/vinterm/vinterm.SlackBuild b/system/vinterm/vinterm.SlackBuild index b40ecfbd96..a6d5f931d8 100644 --- a/system/vinterm/vinterm.SlackBuild +++ b/system/vinterm/vinterm.SlackBuild @@ -19,7 +19,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vinterm VERSION=${VERSION:-0.5.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -78,6 +78,8 @@ sed -i -e '/@echo CC/d' -e 's,@\(\${CC}\),\1,' Makefile # GRR. "make install" respects DESTDIR... except for the icons and .desktop. patch -p1 < $CWD/fix_destdir.diff +# Add an include statement for GCC compatibility. +patch -p1 < $CWD/includes.diff export TERMINFO=$PKG/usr/share/terminfo mkdir -p $TERMINFO diff --git a/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch new file mode 100644 index 0000000000..46c708b9d3 --- /dev/null +++ b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch @@ -0,0 +1,36 @@ +https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117.patch +https://bugs.gentoo.org/831963 + +From 41cc016278e713d3db156761fce6437dff81a53a Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sat, 22 Jan 2022 23:28:20 +0100 +Subject: [PATCH] meson: fix build with meson 0.61 + +i18n.merge_file doesn't accept positional arguments +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,6 @@ if host_machine.system() != 'windows' + desktop = 'remote-viewer.desktop' + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -14,7 +13,6 @@ if host_machine.system() != 'windows' + mimetypes = 'virt-viewer-mime.xml' + + i18n.merge_file ( +- mimetypes, + type: 'xml', + input: mimetypes + '.in', + output: mimetypes, +@@ -27,7 +25,6 @@ if host_machine.system() != 'windows' + metainfo = 'remote-viewer.appdata.xml' + + i18n.merge_file ( +- metainfo, + type: 'xml', + input: metainfo + '.in', + output: metainfo, +GitLab diff --git a/system/virt-viewer/virt-viewer.SlackBuild b/system/virt-viewer/virt-viewer.SlackBuild index c0601c673f..01d6ef5068 100644 --- a/system/virt-viewer/virt-viewer.SlackBuild +++ b/system/virt-viewer/virt-viewer.SlackBuild @@ -68,6 +68,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/virt-viewer-10.0_p20210730-meson-0.61.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/system/virtiofsd/README b/system/virtiofsd/README new file mode 100644 index 0000000000..1cba62a518 --- /dev/null +++ b/system/virtiofsd/README @@ -0,0 +1,19 @@ +virtiofsd is a vhost-user virtio-fs device backend written in Rust. + +This won't work on a 32bit operating system. + +NOTE: if you wish to update virtiofsd yourself you need to create a +tarball first with the vendored versions of the rust dependencies: +to create the "vendor" source dir yourself unpack the virtiofsd +tarball, enter its directory and execute these three commands + + export LD_LIBRARY_PATH="/opt/rust/lib64:$LD_LIBRARY_PATH" + export PATH="/opt/rust/bin:$PATH" + cargo vendor + +then you can create a tarball with + + tar Jcf ../virtiofsd-vendor-$VERSION.tar.xz vendor + +this is necessary to avoid downloading stuff during execution of +the SlackBuild. diff --git a/system/virtiofsd/slack-desc b/system/virtiofsd/slack-desc new file mode 100644 index 0000000000..a1e87c22f0 --- /dev/null +++ b/system/virtiofsd/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------------------------------------------------------| +virtiofsd: virtiofsd (vhost-user virtio-fs device backend) +virtiofsd: +virtiofsd: virtiofsd is a vhost-user virtio-fs device backend written in Rust. +virtiofsd: +virtiofsd: homepage: https://virtio-fs.gitlab.io +virtiofsd: +virtiofsd: +virtiofsd: +virtiofsd: +virtiofsd: +virtiofsd: diff --git a/system/virtiofsd/virtiofsd.SlackBuild b/system/virtiofsd/virtiofsd.SlackBuild new file mode 100644 index 0000000000..f429b9bdb8 --- /dev/null +++ b/system/virtiofsd/virtiofsd.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/bash + +# Slackware build script for virtiofsd + +# Copyright 2023-2024 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=virtiofsd +VERSION=${VERSION:-1.13.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + x86_64) ARCH=x86_64 ;; +# arm*) ARCH=arm ;; + *) echo "ARCH $(uname -m) is unsupported."; exit 1 ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +else + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-v$VERSION +tar xvf $CWD/$PRGNAM-v$VERSION.tar.?z* +cd $PRGNAM-v$VERSION +tar xvf $CWD/$PRGNAM-$VERSION-vendor.tar.xz +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +export PATH="/opt/rust/bin:$PATH" +if [ -z "$LD_LIBRARY_PATH" ]; then + export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" +else + export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" +fi + +mkdir .cargo +cat <>.cargo/config.toml +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" +EOT + +cargo build --release +install -D -p -s -m 0755 target/release/$PRGNAM $PKG/usr/libexec/$PRGNAM +install -D -p -m 0644 50-virtiofsd.json $PKG/usr/share/qemu/vhost-user/50-virtiofsd.json + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.md doc/*.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/virtiofsd/virtiofsd.info b/system/virtiofsd/virtiofsd.info new file mode 100644 index 0000000000..ec02ac2bea --- /dev/null +++ b/system/virtiofsd/virtiofsd.info @@ -0,0 +1,12 @@ +PRGNAM="virtiofsd" +VERSION="1.13.0" +HOMEPAGE="https://virtio-fs.gitlab.io" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v1.13.0/virtiofsd-v1.13.0.tar.bz2 \ + https://ponce.cc/slackware/sources/repo/virtiofsd-1.13.0-vendor.tar.xz" +MD5SUM_x86_64="76a4d9eede5edd07a4e986cb4a7f8fb9 \ + 2dfd689f8824e1bb904eaf669f1e6c52" +REQUIRES="rust-opt" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/virtualbox-addons/gcc13.patch b/system/virtualbox-addons/gcc13.patch new file mode 100644 index 0000000000..40701d717f --- /dev/null +++ b/system/virtualbox-addons/gcc13.patch @@ -0,0 +1,11 @@ +--- Config.kmk.orig 2023-04-13 03:15:13.000000000 -0600 ++++ Config.kmk 2023-06-16 09:59:19.820597642 -0600 +@@ -7485,7 +7485,7 @@ + TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64 + endif + TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-pie -fno-merge-constants -std=c99 -ffreestanding +-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants -ffreestanding ++TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants + TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h + TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h + TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild index 298cb1ef80..d2445314c4 100644 --- a/system/virtualbox-addons/virtualbox-addons.SlackBuild +++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild @@ -89,6 +89,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p0 < $CWD/gcc13.patch + ./configure \ --only-additions \ --disable-kmods \ diff --git a/system/virtualbox-kernel/kernel-6.9.patch b/system/virtualbox-kernel/kernel-6.9.patch new file mode 100644 index 0000000000..5f0d63af38 --- /dev/null +++ b/system/virtualbox-kernel/kernel-6.9.patch @@ -0,0 +1,73 @@ +diff -Naur virtualbox-kernel-6.1.50.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c virtualbox-kernel-6.1.50/vboxdrv/r0drv/linux/memobj-r0drv-linux.c +--- virtualbox-kernel-6.1.50.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2024-02-28 16:14:23.000000000 +0100 ++++ virtualbox-kernel-6.1.50/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2024-06-20 10:07:05.741540749 +0200 +@@ -1078,7 +1078,7 @@ + u.Four = *p4d_offset(&u.Global, ulAddr); + if (RT_UNLIKELY(p4d_none(u.Four))) + return NULL; +- if (p4d_large(u.Four)) ++ if (p4d_leaf(u.Four)) + { + pPage = p4d_page(u.Four); + AssertReturn(pPage, NULL); +@@ -1094,7 +1094,7 @@ + if (RT_UNLIKELY(pud_none(u.Upper))) + return NULL; + # if RTLNX_VER_MIN(2,6,25) +- if (pud_large(u.Upper)) ++ if (pud_leaf(u.Upper)) + { + pPage = pud_page(u.Upper); + AssertReturn(pPage, NULL); +@@ -1110,7 +1110,7 @@ + if (RT_UNLIKELY(pmd_none(u.Middle))) + return NULL; + #if RTLNX_VER_MIN(2,6,0) +- if (pmd_large(u.Middle)) ++ if (pmd_leaf(u.Middle)) + { + pPage = pmd_page(u.Middle); + AssertReturn(pPage, NULL); +diff -Naur virtualbox-kernel-6.1.50.orig/vboxnetflt/linux/VBoxNetFlt-linux.c virtualbox-kernel-6.1.50/vboxnetflt/linux/VBoxNetFlt-linux.c +--- virtualbox-kernel-6.1.50.orig/vboxnetflt/linux/VBoxNetFlt-linux.c 2024-02-28 16:14:23.000000000 +0100 ++++ virtualbox-kernel-6.1.50/vboxnetflt/linux/VBoxNetFlt-linux.c 2024-06-20 10:07:53.820540749 +0200 +@@ -156,6 +156,17 @@ + # endif + #endif + ++#if RTLNX_VER_MIN(6,9,0) ++# define VBOX_SKB_FRAG_LEN(_pFrag) ((_pFrag)->len) ++# define VBOX_SKB_FRAG_OFFSET(_pFrag) ((_pFrag)->offset) ++#elif RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2) ++# define VBOX_SKB_FRAG_LEN(_pFrag) ((_pFrag)->bv_len) ++# define VBOX_SKB_FRAG_OFFSET(_pFrag) ((_pFrag)->bv_offset) ++#else /* < KERNEL_VERSION(5, 4, 0) */ ++# define VBOX_SKB_FRAG_LEN(_pFrag) ((_pFrag)->size) ++# define VBOX_SKB_FRAG_OFFSET(_pFrag) ((_pFrag)->page_offset) ++#endif /* > KERNEL_VERSION(6, 9, 0) */ ++ + #if RTLNX_VER_MIN(3,20,0) || RTLNX_RHEL_RANGE(7,2, 8,0) || RTLNX_RHEL_RANGE(6,8, 7,0) + # define VBOX_HAVE_SKB_VLAN + #endif +@@ -918,8 +929,8 @@ + { + skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i]; + # if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2) +- pSG->aSegs[iSeg].cb = pFrag->bv_len; +- pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; ++ pSG->aSegs[iSeg].cb = VBOX_SKB_FRAG_LEN(pFrag); ++ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + VBOX_SKB_FRAG_OFFSET(pFrag); + # else /* < KERNEL_VERSION(5, 4, 0) */ + pSG->aSegs[iSeg].cb = pFrag->size; + pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset; +@@ -939,8 +950,8 @@ + { + skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i]; + # if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2) +- pSG->aSegs[iSeg].cb = pFrag->bv_len; +- pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; ++ pSG->aSegs[iSeg].cb = VBOX_SKB_FRAG_LEN(pFrag); ++ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + VBOX_SKB_FRAG_OFFSET(pFrag); + # else /* < KERNEL_VERSION(5, 4, 0) */ + pSG->aSegs[iSeg].cb = pFrag->size; + pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset; diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild index bc2d979b04..0b3e8930d0 100644 --- a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild +++ b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild @@ -75,6 +75,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/kernel-6.9.patch + # Fix compatibility with 5.18.x sed -i "s|netif_rx_ni|netif_rx|g" vboxnetflt/linux/VBoxNetFlt-linux.c diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild index e4c4d04639..56edf25e19 100644 --- a/system/virtualbox/virtualbox.SlackBuild +++ b/system/virtualbox/virtualbox.SlackBuild @@ -131,7 +131,7 @@ patch -p1 -i $CWD/006-rdesktop-vrdp-keymap-path.patch sed -i 's|python2.7 python2.6 |python3.10 |' ./configure # Use our CFLAGS -sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11\"|" ./configure +sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11 -fpermissive\"|" ./configure ./configure \ --disable-kmods \ @@ -147,7 +147,7 @@ sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11\"|" ./configure cp $CWD/LocalConfig.kmk . sed -i "s|LIBDIR|lib$LIBDIRSUFFIX|" ./LocalConfig.kmk -sed -i "s|CXXFLAGS|$SLKCFLAGS -std=c++11|" ./LocalConfig.kmk +sed -i "s|CXXFLAGS|$SLKCFLAGS -std=c++11 -fpermissive|" ./LocalConfig.kmk kmk -j ${JOBS} LOCALCFG=./LocalConfig.kmk diff --git a/system/wayland-utils/README b/system/wayland-utils/README deleted file mode 100644 index 5686305595..0000000000 --- a/system/wayland-utils/README +++ /dev/null @@ -1,9 +0,0 @@ -wayland-info is a utility for displaying information about the Wayland -protocols supported by a Wayland compositor. - -It can be used to check which Wayland protocols and versions are -advertised by the Wayland compositor. - -wayland-info also provides additional information for a subset of -Wayland protocols it knows about, namely Linux DMABUF, -presentation time, tablet and XDG output protocols. diff --git a/system/wayland-utils/slack-desc b/system/wayland-utils/slack-desc deleted file mode 100644 index 2a739c39e3..0000000000 --- a/system/wayland-utils/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -wayland-utils: wayland-utils (utility for displaying information about the Wayland) -wayland-utils: -wayland-utils: It can be used to check which Wayland protocols and versions are -wayland-utils: advertised by the Wayland compositor. -wayland-utils: -wayland-utils: wayland-info also provides additional information for a subset of -wayland-utils: Wayland protocols it knows about, namely Linux DMABUF, -wayland-utils: presentation time, tablet and XDG output protocols. -wayland-utils: -wayland-utils: -wayland-utils: diff --git a/system/wayland-utils/wayland-utils.SlackBuild b/system/wayland-utils/wayland-utils.SlackBuild deleted file mode 100644 index bf432fafbf..0000000000 --- a/system/wayland-utils/wayland-utils.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -# Slackware build script for wayland-utils - -# Copyright 2023 -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=wayland-utils -VERSION=${VERSION:-1.2.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" -else - SLKCFLAGS="-O2" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson setup .. \ - --prefix=/usr \ - --mandir=/usr/man - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/wayland-utils/wayland-utils.info b/system/wayland-utils/wayland-utils.info deleted file mode 100644 index e2d519e476..0000000000 --- a/system/wayland-utils/wayland-utils.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wayland-utils" -VERSION="1.2.0" -HOMEPAGE="https://gitlab.freedesktop.org/wayland/wayland-utils" -DOWNLOAD="https://gitlab.freedesktop.org/wayland/wayland-utils/-/archive/1.2.0/wayland-utils-1.2.0.tar.gz" -MD5SUM="e6e6e41e9a36c5ead8daa3dba64d9b21" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="marav" -EMAIL="marav8@free.fr" diff --git a/system/xar/xar.SlackBuild b/system/xar/xar.SlackBuild index 1283e260da..3641c06b8c 100644 --- a/system/xar/xar.SlackBuild +++ b/system/xar/xar.SlackBuild @@ -122,6 +122,8 @@ ln -sf ../xar.h include/xar/xar.h # -I doesn't affect #include "blah.h". sed -i 's,"\(\(util\|filetree\)\.h\)",<\1>,' src/xar.c +sed -i '/ext2fs\/ext2_fs/i #include ' lib/ext2.c + # xar executable, library, and includes. have to manually add # openssl's libs, and jigger the include path for and # . diff --git a/system/xbindkeys/xbindkeys.SlackBuild b/system/xbindkeys/xbindkeys.SlackBuild index 9d66578e8e..9d033bda91 100644 --- a/system/xbindkeys/xbindkeys.SlackBuild +++ b/system/xbindkeys/xbindkeys.SlackBuild @@ -79,6 +79,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 -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/xbindkeys/xbindkeys.info b/system/xbindkeys/xbindkeys.info index 2856be1820..2621e201b0 100644 --- a/system/xbindkeys/xbindkeys.info +++ b/system/xbindkeys/xbindkeys.info @@ -5,6 +5,6 @@ DOWNLOAD="http://www.nongnu.org/xbindkeys/xbindkeys-1.8.7.tar.gz" MD5SUM="b5e1a9668ba13ff8673836d1d965d951" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="guile2.2" +REQUIRES="" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" diff --git a/system/xboxdrv-linux/fix-60-sec-delay.patch b/system/xboxdrv-linux/fix-60-sec-delay.patch deleted file mode 100644 index da543d2cfa..0000000000 --- a/system/xboxdrv-linux/fix-60-sec-delay.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7326421eeaadbc2aeb3828628c2e65bb7be323a9 Mon Sep 17 00:00:00 2001 -From: buxit -Date: Wed, 2 Nov 2016 16:25:14 +0100 -Subject: [PATCH] fix 60 seconds delay - -use `libusb_handle_events_timeout_completed()` instead of `libusb_handle_events()` -should fix #144 ---- - src/usb_gsource.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/usb_gsource.cpp b/src/usb_gsource.cpp -index 00bf1315..afb38f65 100644 ---- a/src/usb_gsource.cpp -+++ b/src/usb_gsource.cpp -@@ -174,7 +174,10 @@ USBGSource::on_source_dispatch(GSource* source, GSourceFunc callback, gpointer u - gboolean - USBGSource::on_source() - { -- libusb_handle_events(NULL); -+ struct timeval to; -+ to.tv_sec = 0; -+ to.tv_usec = 0; -+ libusb_handle_events_timeout_completed(NULL, &to, NULL); - return TRUE; - } - diff --git a/system/xboxdrv-linux/scons-py3.patch b/system/xboxdrv-linux/scons-py3.patch deleted file mode 100644 index 4aa6fa6193..0000000000 --- a/system/xboxdrv-linux/scons-py3.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 17bd43a7d3ef86216abc36b42b4e6a1f70aa9979 Mon Sep 17 00:00:00 2001 -From: xnick -Date: Thu, 12 Oct 2017 20:34:35 +0300 -Subject: [PATCH] Update SConstruct - -python3 compatible ---- - SConstruct | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 4cd79704..c0007054 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -19,7 +19,7 @@ def build_dbus_glue(target, source, env): - xml = re.sub(r"callback = \(([A-Za-z_]+)\) \(marshal_data \? marshal_data : cc->callback\);", - r"union { \1 fn; void* obj; } conv;\n " - "conv.obj = (marshal_data ? marshal_data : cc->callback);\n " -- "callback = conv.fn;", xml) -+ "callback = conv.fn;", xml.decode('utf-8')) - - with open(target[0].get_path(), "w") as f: - f.write(xml) -@@ -29,10 +29,10 @@ def build_bin2h(target, source, env): - Takes a list of files and converts them into a C source that can be included - """ - def c_escape(str): -- return str.translate(string.maketrans("/.-", "___")) -+ return str.translate(bytes.maketrans(b"/.-", b"___")) - -- print target -- print source -+ print(target) -+ print(source) - with open(target[0].get_path(), "w") as fout: - fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n") - -@@ -45,8 +45,8 @@ def build_bin2h(target, source, env): - data = fin.read() - fout.write("// \"%s\"\n" % src.get_path()) - fout.write("const char %s[] = {" % c_escape(src.get_path())) -- bytes_arr = ["0x%02x" % ord(c) for c in data] -- for i in xrange(len(bytes_arr)): -+ bytes_arr = ["0x%02x" % c for c in data] -+ for i in range(len(bytes_arr)): - if i % 13 == 0: - fout.write("\n ") - fout.write(bytes_arr[i]) -@@ -131,12 +131,12 @@ env.Append(CPPDEFINES = { 'PACKAGE_VERSION': "'\"%s\"'" % package_version }) - conf = Configure(env) - - if not conf.env['CXX']: -- print "g++ must be installed!" -+ print('g++ must be installed!') - Exit(1) - - # X11 checks - if not conf.CheckLibWithHeader('X11', 'X11/Xlib.h', 'C++'): -- print 'libx11-dev must be installed!' -+ print('libx11-dev must be installed!') - Exit(1) - - env = conf.Finish() diff --git a/system/xboxdrv-linux/scons-v4.2.0.patch b/system/xboxdrv-linux/scons-v4.2.0.patch deleted file mode 100644 index 04b05e8d6f..0000000000 --- a/system/xboxdrv-linux/scons-v4.2.0.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/SConstruct 2021-10-31 20:42:44.232084185 -0400 -+++ b/SConstruct 2021-10-31 20:42:54.063024444 -0400 -@@ -36,7 +36,7 @@ - with open(target[0].get_path(), "w") as fout: - fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n") - -- if env.has_key("BIN2H_NAMESPACE"): -+ if "BIN2H_NAMESPACE" in env: - fout.write("namespace %s {\n\n" % env["BIN2H_NAMESPACE"]) - - # write down data -@@ -62,7 +62,7 @@ - for src in source], ",\n")) - fout.write("\n}\n\n") - -- if env.has_key("BIN2H_NAMESPACE"): -+ if "BIN2H_NAMESPACE" in env: - fout.write("} // namespace %s\n\n" % env["BIN2H_NAMESPACE"]) - - fout.write("/* EOF */\n") diff --git a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild index 731080f529..6cce3b33c3 100644 --- a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild +++ b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild @@ -32,8 +32,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xboxdrv-linux -VERSION=${VERSION:-0.8.8} -BUILD=${BUILD:-3} +SRCNAM=xboxdrv +VERSION=${VERSION:-0.8.11} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -45,9 +46,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -76,14 +74,9 @@ 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 -# thanks arch maintainers -patch -p1 < "$CWD/fix-60-sec-delay.patch" -patch -p1 < "$CWD/scons-py3.patch" -patch -p1 < "$CWD/scons-v4.2.0.patch" -patch -p1 < "$CWD/xboxdrvctl-py3.patch" +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/system/xboxdrv-linux/xboxdrv-linux.info b/system/xboxdrv-linux/xboxdrv-linux.info index fb8f4aecae..c1d328c56d 100644 --- a/system/xboxdrv-linux/xboxdrv-linux.info +++ b/system/xboxdrv-linux/xboxdrv-linux.info @@ -1,8 +1,8 @@ PRGNAM="xboxdrv-linux" -VERSION="0.8.8" -HOMEPAGE="https://xboxdrv.gitlab.io/" -DOWNLOAD="https://xboxdrv.gitlab.io/xboxdrv-linux-0.8.8.tar.bz2" -MD5SUM="a62703eda7d59393538b2f22d5b0c791" +VERSION="0.8.11" +HOMEPAGE="https://github.com/xiota/xboxdrv" +DOWNLOAD="https://github.com/xiota/xboxdrv/archive/v0.8.11/xboxdrv-0.8.11.tar.gz" +MD5SUM="982458c2236be19d47f907ea50ad1fca" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/xboxdrv-linux/xboxdrvctl-py3.patch b/system/xboxdrv-linux/xboxdrvctl-py3.patch deleted file mode 100644 index 71d8762cb9..0000000000 --- a/system/xboxdrv-linux/xboxdrvctl-py3.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- a/xboxdrvctl 2021-06-21 19:39:51.000000000 -0400 -+++ b/xboxdrvctl 19:43:27.467984928 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - - ## Xbox360 USB Gamepad Userspace Driver - ## Copyright (C) 2011 Ingo Ruhnke -@@ -37,23 +37,23 @@ - help="print controller status") - - group.add_option("-s", "--slot", metavar="SLOT", type="int", -- dest="slot", -+ dest="slot", - help="use slot SLOT for actions") - - group.add_option("-l", "--led", metavar="NUM", type="int", -- dest="led", -+ dest="led", - help="set LED") - --group.add_option("-r", "--rumble", metavar="L:R", -- dest="rumble", -+group.add_option("-r", "--rumble", metavar="L:R", -+ dest="rumble", - help="print controller status") - - group.add_option("-c", "--config", metavar="NUM", type="int", -- dest="config", -+ dest="config", - help="switches to controller configuration NUM") - - group.add_option("--shutdown", action="store_true", -- dest="shutdown", -+ dest="shutdown", - help="shuts down the daemon") - - parser.add_option_group(group) -@@ -69,9 +69,9 @@ - try: - bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/Daemon') - except dbus.exceptions.DBusException: -- bus = dbus.SystemBus() -+ bus = dbus.SystemBus() - else: -- print "Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'" -+ print("Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'") - exit() - - if options.status: -@@ -82,19 +82,19 @@ - daemon.Shutdown() - else: - if (options.led or options.rumble or options.config) and options.slot == None: -- print "Error: --slot argument required" -+ print("Error: --slot argument required") - exit() - else: - if options.slot != None: - slot = bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/ControllerSlots/%d' % options.slot) -- -+ - if options.led != None: - slot.SetLed(options.led) - - if options.rumble: - m = re.match('^(\d+):(\d+)$', options.rumble) - if not m: -- print "Error: invalid argument to --rumble" -+ print("Error: invalid argument to --rumble") - exit() - else: - left = int(m.group(1))