diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch | 121 | ||||
| -rwxr-xr-x | source/a/grub/grub.SlackBuild | 5 | ||||
| -rwxr-xr-x | source/d/rust/rust.SlackBuild | 10 | ||||
| -rw-r--r-- | source/d/rust/rust.url | 8 | ||||
| -rwxr-xr-x | source/l/gst-plugins-good/gst-plugins-good.SlackBuild | 4 | ||||
| -rw-r--r-- | source/l/gst-plugins-good/gst-plugins-good.gcc11.patch | 316 | ||||
| -rwxr-xr-x | source/l/libgtop/libgtop.SlackBuild | 5 | ||||
| -rwxr-xr-x | source/n/dnsmasq/dnsmasq.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/xfce/mousepad/mousepad.SlackBuild | 5 |
9 files changed, 144 insertions, 332 deletions
diff --git a/source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch b/source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch new file mode 100644 index 000000000..5abc747af --- /dev/null +++ b/source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch @@ -0,0 +1,121 @@ +From a4b495520e4dc41a896a8b916a64eda9970c50ea Mon Sep 17 00:00:00 2001 +From: Erwan Velu <erwanaliasr1@gmail.com> +Date: Wed, 25 Aug 2021 15:31:52 +0200 +Subject: fs/xfs: Fix unreadable filesystem with v4 superblock + +The commit 8b1e5d193 (fs/xfs: Add bigtime incompat feature support) +introduced the bigtime support by adding some features in v3 inodes. +This change extended grub_xfs_inode struct by 76 bytes but also changed +the computation of XFS_V2_INODE_SIZE and XFS_V3_INODE_SIZE. Prior this +commit, XFS_V2_INODE_SIZE was 100 bytes. After the commit it's 84 bytes +XFS_V2_INODE_SIZE becomes 16 bytes too small. + +As a result, the data structures aren't properly aligned and the GRUB +generates "attempt to read or write outside of partition" errors when +trying to read the XFS filesystem: + + GNU GRUB version 2.11 + .... + grub> set debug=efi,gpt,xfs + grub> insmod part_gpt + grub> ls (hd0,gpt1)/ + partmap/gpt.c:93: Read a valid GPT header + partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125 + fs/xfs.c:931: Reading sb + fs/xfs.c:270: Validating superblock + fs/xfs.c:295: XFS v4 superblock detected + fs/xfs.c:962: Reading root ino 128 + fs/xfs.c:515: Reading inode (128) - 64, 0 + fs/xfs.c:515: Reading inode (739521961424144223) - 344365866970255880, 3840 + error: attempt to read or write outside of partition. + +This commit change the XFS_V2_INODE_SIZE computation by subtracting 76 +bytes instead of 92 bytes from the actual size of grub_xfs_inode struct. +This 76 bytes value comes from added members: + 20 grub_uint8_t unused5 + 1 grub_uint64_t flags2 + 48 grub_uint8_t unused6 + +This patch explicitly splits the v2 and v3 parts of the structure. +The unused4 is still ending of the v2 structures and the v3 starts +at unused5. Thanks to this we will avoid future corruptions of v2 +or v3 inodes. + +The XFS_V2_INODE_SIZE is returning to its expected size and the +filesystem is back to a readable state: + + GNU GRUB version 2.11 + .... + grub> set debug=efi,gpt,xfs + grub> insmod part_gpt + grub> ls (hd0,gpt1)/ + partmap/gpt.c:93: Read a valid GPT header + partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125 + fs/xfs.c:931: Reading sb + fs/xfs.c:270: Validating superblock + fs/xfs.c:295: XFS v4 superblock detected + fs/xfs.c:962: Reading root ino 128 + fs/xfs.c:515: Reading inode (128) - 64, 0 + fs/xfs.c:515: Reading inode (128) - 64, 0 + fs/xfs.c:931: Reading sb + fs/xfs.c:270: Validating superblock + fs/xfs.c:295: XFS v4 superblock detected + fs/xfs.c:962: Reading root ino 128 + fs/xfs.c:515: Reading inode (128) - 64, 0 + fs/xfs.c:515: Reading inode (128) - 64, 0 + fs/xfs.c:515: Reading inode (128) - 64, 0 + fs/xfs.c:515: Reading inode (131) - 64, 768 + efi/ fs/xfs.c:515: Reading inode (3145856) - 1464904, 0 + grub2/ fs/xfs.c:515: Reading inode (132) - 64, 1024 + grub/ fs/xfs.c:515: Reading inode (139) - 64, 2816 + grub> + +Fixes: 8b1e5d193 (fs/xfs: Add bigtime incompat feature support) + +Signed-off-by: Erwan Velu <e.velu@criteo.com> +Tested-by: Carlos Maiolino <cmaiolino@redhat.com> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +--- + grub-core/fs/xfs.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index 0f524c3a8..e3816d1ec 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -192,6 +192,11 @@ struct grub_xfs_time_legacy + grub_uint32_t nanosec; + } GRUB_PACKED; + ++/* ++ * The struct grub_xfs_inode layout was taken from the ++ * struct xfs_dinode_core which is described here: ++ * https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/docs/xfs_filesystem_structure.pdf ++ */ + struct grub_xfs_inode + { + grub_uint8_t magic[2]; +@@ -208,14 +213,15 @@ struct grub_xfs_inode + grub_uint32_t nextents; + grub_uint16_t unused3; + grub_uint8_t fork_offset; +- grub_uint8_t unused4[37]; ++ grub_uint8_t unused4[17]; /* Last member of inode v2. */ ++ grub_uint8_t unused5[20]; /* First member of inode v3. */ + grub_uint64_t flags2; +- grub_uint8_t unused5[48]; ++ grub_uint8_t unused6[48]; /* Last member of inode v3. */ + } GRUB_PACKED; + + #define XFS_V3_INODE_SIZE sizeof(struct grub_xfs_inode) +-/* Size of struct grub_xfs_inode until fork_offset (included). */ +-#define XFS_V2_INODE_SIZE (XFS_V3_INODE_SIZE - 92) ++/* Size of struct grub_xfs_inode v2, up to unused4 member included. */ ++#define XFS_V2_INODE_SIZE (XFS_V3_INODE_SIZE - 76) + + struct grub_xfs_dirblock_tail + { +-- +cgit v1.2.1 + + diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild index cda4f57d3..7cf8b5b26 100755 --- a/source/a/grub/grub.SlackBuild +++ b/source/a/grub/grub.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=grub VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # Better to use _ than ~ in the package filenames version: PKGVER=$(echo $VERSION | tr '~' '_') -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -112,6 +112,9 @@ zcat $CWD/grub.dejavusansmono.gfxterm.font.diff.gz | patch -p1 --verbose || exit # Fix alignment error with gcc8: zcat $CWD/0198-align-struct-efi_variable-better.patch.gz | patch -p1 --verbose || exit 1 +# Fix unreadable XFS filesystem with v4 superblock: +zcat $CWD/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch.gz | patch -p1 --verbose || exit 1 + # Regenerate build system to fix dependency on outdated automake: autoreconf -vif diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 230567294..0000ae3a9 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,17 +26,17 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.54.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.55.0} +BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. # YES is probably better (when it works...) SYSTEM_LLVM=${SYSTEM_LLVM:-YES} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.53.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2021-06-17} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.53.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.54.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2021-07-29} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.54.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index 6733bccc5..1f4a237b6 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.lz): -VERSION=1.54.0 +VERSION=1.55.0 rm -f rustc-${VERSION}-src.tar.* lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz.asc @@ -20,9 +20,9 @@ fi # update the settings below, look at src/stage0.txt in the Rust sources. exit 0 -BOOTSTRAP_DATE=2021-06-17 -BOOTSTRAP_CARGO=1.53.0 -BOOTSTRAP_VERSION=1.53.0 +BOOTSTRAP_DATE=2021-07-29 +BOOTSTRAP_CARGO=1.54.0 +BOOTSTRAP_VERSION=1.54.0 # i686 bootstrap: lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-i686-unknown-linux-gnu.tar.xz diff --git a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild index fd87f2d5e..2171a194c 100755 --- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild +++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gst-plugins-good VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -88,8 +88,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/gst-plugins-good.gcc11.patch.gz | patch -p1 --verbose || exit 1 - # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/l/gst-plugins-good/gst-plugins-good.gcc11.patch b/source/l/gst-plugins-good/gst-plugins-good.gcc11.patch deleted file mode 100644 index f44e3a720..000000000 --- a/source/l/gst-plugins-good/gst-plugins-good.gcc11.patch +++ /dev/null @@ -1,316 +0,0 @@ -From a1bf3d8d540a25268d612a489e1e836d6ea737b0 Mon Sep 17 00:00:00 2001 -From: Matthew Waters <matthew@centricular.com> -Date: Thu, 18 Mar 2021 19:52:53 +1100 -Subject: [PATCH] gst: don't use volatile to mean atomic - -volatile is not sufficient to provide atomic guarantees and real atomics -should be used instead. GCC 11 has started warning about using volatile -with atomic operations. - -https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 - -Discovered in https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/868 - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/941> ---- - ext/jack/gstjack.c | 6 +++--- - ext/jack/gstjackaudiosink.c | 2 +- - ext/jack/gstjackaudiosrc.c | 2 +- - ext/pulse/pulsesink.h | 2 +- - ext/qt/gstqsgtexture.cc | 2 +- - ext/qt/gstqtglutility.cc | 2 +- - ext/qt/qtglrenderer.cc | 6 +++--- - ext/qt/qtitem.cc | 2 +- - ext/qt/qtwindow.cc | 4 ++-- - ext/vpx/gstvpxdec.c | 2 +- - ext/vpx/gstvpxenc.c | 14 +++++++------- - gst/audioparsers/gstac3parse.h | 2 +- - sys/rpicamsrc/gstrpicamsrc.c | 2 +- - sys/ximage/ximageutil.c | 2 +- - 14 files changed, 25 insertions(+), 25 deletions(-) - -diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c -index ca98dc405..fdd507d87 100644 ---- a/ext/jack/gstjack.c -+++ b/ext/jack/gstjack.c -@@ -28,7 +28,7 @@ - GType - gst_jack_connect_get_type (void) - { -- static volatile gsize jack_connect_type = 0; -+ static gsize jack_connect_type = 0; - - if (g_once_init_enter (&jack_connect_type)) { - static const GEnumValue jack_connect_enums[] = { -@@ -50,7 +50,7 @@ gst_jack_connect_get_type (void) - GType - gst_jack_transport_get_type (void) - { -- static volatile gsize type = 0; -+ static gsize type = 0; - - if (g_once_init_enter (&type)) { - static const GFlagsValue flag_values[] = { -@@ -84,7 +84,7 @@ gst_jack_client_free (gpointer jclient) - GType - gst_jack_client_get_type (void) - { -- static volatile gsize jack_client_type = 0; -+ static gsize jack_client_type = 0; - - if (g_once_init_enter (&jack_client_type)) { - /* hackish, but makes it show up nicely in gst-inspect */ -diff --git a/ext/jack/gstjackaudiosink.c b/ext/jack/gstjackaudiosink.c -index ee7cea8c0..6e8d04ae5 100644 ---- a/ext/jack/gstjackaudiosink.c -+++ b/ext/jack/gstjackaudiosink.c -@@ -131,7 +131,7 @@ gst_jack_audio_sink_free_channels (GstJackAudioSink * sink) - static GType - gst_jack_ring_buffer_get_type (void) - { -- static volatile gsize ringbuffer_type = 0; -+ static gsize ringbuffer_type = 0; - - if (g_once_init_enter (&ringbuffer_type)) { - static const GTypeInfo ringbuffer_info = { -diff --git a/ext/jack/gstjackaudiosrc.c b/ext/jack/gstjackaudiosrc.c -index 1d2cf82ee..d43a447a7 100644 ---- a/ext/jack/gstjackaudiosrc.c -+++ b/ext/jack/gstjackaudiosrc.c -@@ -151,7 +151,7 @@ gst_jack_audio_src_free_channels (GstJackAudioSrc * src) - static GType - gst_jack_ring_buffer_get_type (void) - { -- static volatile gsize ringbuffer_type = 0; -+ static gsize ringbuffer_type = 0; - - if (g_once_init_enter (&ringbuffer_type)) { - static const GTypeInfo ringbuffer_info = { sizeof (GstJackRingBufferClass), -diff --git a/ext/pulse/pulsesink.h b/ext/pulse/pulsesink.h -index 86f3dcdbb..51ec86a25 100644 ---- a/ext/pulse/pulsesink.h -+++ b/ext/pulse/pulsesink.h -@@ -72,7 +72,7 @@ struct _GstPulseSink - GstStructure *properties; - pa_proplist *proplist; - -- volatile gint format_lost; -+ gint format_lost; - GstClockTime format_lost_time; - }; - -diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc -index a05d26edd..bfa79cda0 100644 ---- a/ext/qt/gstqsgtexture.cc -+++ b/ext/qt/gstqsgtexture.cc -@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); - - GstQSGTexture::GstQSGTexture () - { -- static volatile gsize _debug; -+ static gsize _debug; - - initializeOpenGLFunctions(); - -diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc -index acb89b6e1..d2c092202 100644 ---- a/ext/qt/gstqtglutility.cc -+++ b/ext/qt/gstqtglutility.cc -@@ -66,7 +66,7 @@ gst_qt_get_gl_display () - { - GstGLDisplay *display = NULL; - QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ()); -- static volatile gsize _debug; -+ static gsize _debug; - - g_assert (app != NULL); - -diff --git a/ext/qt/qtglrenderer.cc b/ext/qt/qtglrenderer.cc -index 2ad5601fc..52965fd0b 100644 ---- a/ext/qt/qtglrenderer.cc -+++ b/ext/qt/qtglrenderer.cc -@@ -22,7 +22,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); - static void - init_debug (void) - { -- static volatile gsize _debug; -+ static gsize _debug; - - if (g_once_init_enter (&_debug)) { - GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglrenderer", 0, -@@ -115,7 +115,7 @@ typedef enum - - struct SharedRenderData - { -- volatile int refcount; -+ int refcount; - SharedRenderDataState state; - GMutex lock; - GCond cond; -@@ -130,7 +130,7 @@ shared_render_data_new (void) - { - struct SharedRenderData *ret = g_new0 (struct SharedRenderData, 1); - -- ret->refcount = 1; -+ g_atomic_int_set (&ret->refcount, 1); - g_mutex_init (&ret->lock); - - return ret; -diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc -index 7659800b6..bc99639b4 100644 ---- a/ext/qt/qtitem.cc -+++ b/ext/qt/qtitem.cc -@@ -104,7 +104,7 @@ void InitializeSceneGraph::run() - - QtGLVideoItem::QtGLVideoItem() - { -- static volatile gsize _debug; -+ static gsize _debug; - - if (g_once_init_enter (&_debug)) { - GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget"); -diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc -index 9360c3337..7c44ac54e 100644 ---- a/ext/qt/qtwindow.cc -+++ b/ext/qt/qtwindow.cc -@@ -103,7 +103,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) : - QQuickWindow( parent ), source (src) - { - QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ()); -- static volatile gsize _debug; -+ static gsize _debug; - - g_assert (app != NULL); - -@@ -152,7 +152,7 @@ QtGLWindow::beforeRendering() - - g_mutex_lock (&this->priv->lock); - -- static volatile gsize once = 0; -+ static gsize once = 0; - if (g_once_init_enter(&once)) { - this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch(); - g_once_init_leave(&once,1); -diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c -index e92aa85c7..74cc3c970 100644 ---- a/ext/vpx/gstvpxdec.c -+++ b/ext/vpx/gstvpxdec.c -@@ -79,7 +79,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) - {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"}, - {0, NULL, NULL} - }; -- static volatile GType id = 0; -+ static GType id = 0; - - if (g_once_init_enter ((gsize *) & id)) { - GType _id; -diff --git a/ext/vpx/gstvpxenc.c b/ext/vpx/gstvpxenc.c -index cd5b30d14..4b3b4f770 100644 ---- a/ext/vpx/gstvpxenc.c -+++ b/ext/vpx/gstvpxenc.c -@@ -165,7 +165,7 @@ gst_vpx_enc_end_usage_get_type (void) - {VPX_CQ, "Constant Quality Mode (CQ) mode", "cq"}, - {0, NULL, NULL} - }; -- static volatile GType id = 0; -+ static GType id = 0; - - if (g_once_init_enter ((gsize *) & id)) { - GType _id; -@@ -188,7 +188,7 @@ gst_vpx_enc_multipass_mode_get_type (void) - {VPX_RC_LAST_PASS, "Last pass of multipass encoding", "last-pass"}, - {0, NULL, NULL} - }; -- static volatile GType id = 0; -+ static GType id = 0; - - if (g_once_init_enter ((gsize *) & id)) { - GType _id; -@@ -210,7 +210,7 @@ gst_vpx_enc_kf_mode_get_type (void) - {VPX_KF_DISABLED, "Don't automatically place keyframes", "disabled"}, - {0, NULL, NULL} - }; -- static volatile GType id = 0; -+ static GType id = 0; - - if (g_once_init_enter ((gsize *) & id)) { - GType _id; -@@ -232,7 +232,7 @@ gst_vpx_enc_tuning_get_type (void) - {VP8_TUNE_SSIM, "Tune for SSIM", "ssim"}, - {0, NULL, NULL} - }; -- static volatile GType id = 0; -+ static GType id = 0; - - if (g_once_init_enter ((gsize *) & id)) { - GType _id; -@@ -256,7 +256,7 @@ gst_vpx_enc_scaling_mode_get_type (void) - {VP8E_ONETWO, "1:2", "1:2"}, - {0, NULL, NULL} - }; -- static volatile GType id = 0; -+ static GType id = 0; - - if (g_once_init_enter ((gsize *) & id)) { - GType _id; -@@ -280,7 +280,7 @@ gst_vpx_enc_token_partitions_get_type (void) - {VP8_EIGHT_TOKENPARTITION, "Eight token partitions", "8"}, - {0, NULL, NULL} - }; -- static volatile GType id = 0; -+ static GType id = 0; - - if (g_once_init_enter ((gsize *) & id)) { - GType _id; -@@ -303,7 +303,7 @@ gst_vpx_enc_er_flags_get_type (void) - "Allow partitions to be decoded independently", "partitions"}, - {0, NULL, NULL} - }; -- static volatile GType id = 0; -+ static GType id = 0; - - if (g_once_init_enter ((gsize *) & id)) { - GType _id; -diff --git a/gst/audioparsers/gstac3parse.h b/gst/audioparsers/gstac3parse.h -index 0e7af5acd..81e2104d5 100644 ---- a/gst/audioparsers/gstac3parse.h -+++ b/gst/audioparsers/gstac3parse.h -@@ -62,7 +62,7 @@ struct _GstAc3Parse { - gint blocks; - gboolean eac; - gboolean sent_codec_tag; -- volatile gint align; -+ gint align; - GstPadChainFunction baseparse_chainfunc; - }; - -diff --git a/sys/rpicamsrc/gstrpicamsrc.c b/sys/rpicamsrc/gstrpicamsrc.c -index a148d4106..f719acb4c 100644 ---- a/sys/rpicamsrc/gstrpicamsrc.c -+++ b/sys/rpicamsrc/gstrpicamsrc.c -@@ -292,7 +292,7 @@ gst_rpi_cam_src_sensor_mode_get_type (void) - "640x480 4:3 60.1-90fps", "640x480-fast"}, - {0, NULL, NULL} - }; -- static volatile GType id = 0; -+ static GType id = 0; - if (g_once_init_enter ((gsize *) & id)) { - GType _id; - _id = g_enum_register_static ("GstRpiCamSrcSensorMode", values); -diff --git a/sys/ximage/ximageutil.c b/sys/ximage/ximageutil.c -index 57c9392c7..018b60515 100644 ---- a/sys/ximage/ximageutil.c -+++ b/sys/ximage/ximageutil.c -@@ -26,7 +26,7 @@ - GType - gst_meta_ximage_api_get_type (void) - { -- static volatile GType type; -+ static GType type; - static const gchar *tags[] = { "memory", NULL }; - - if (g_once_init_enter (&type)) { --- -GitLab - - diff --git a/source/l/libgtop/libgtop.SlackBuild b/source/l/libgtop/libgtop.SlackBuild index d1a9a8237..787d2339a 100755 --- a/source/l/libgtop/libgtop.SlackBuild +++ b/source/l/libgtop/libgtop.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libgtop VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -102,6 +102,9 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # 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 diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild index 329ca6272..29a79927c 100755 --- a/source/n/dnsmasq/dnsmasq.SlackBuild +++ b/source/n/dnsmasq/dnsmasq.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dnsmasq VERSION=${VERSION:-$(echo dnsmasq-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} EXTRA_BUILD_OPTS=${EXTRA_BUILD_OPTS:-"-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"} diff --git a/source/xfce/mousepad/mousepad.SlackBuild b/source/xfce/mousepad/mousepad.SlackBuild index 393251b4e..955a4c671 100755 --- a/source/xfce/mousepad/mousepad.SlackBuild +++ b/source/xfce/mousepad/mousepad.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mousepad VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -100,6 +100,9 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # 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 |