summaryrefslogtreecommitdiffstats
path: root/source/l/gcr
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-02-21 20:21:38 +0000
committer Eric Hameleers <alien@slackware.com>2022-02-22 06:59:43 +0100
commit32fa88b60c4d872b057e9e7651b351d54affa40e (patch)
tree9adf4cc6cac2f4aa1f78e1b45a8d3ce786412423 /source/l/gcr
parentd5740c2f619f72d61555bb6bef595aa0172ba60f (diff)
downloadcurrent-32fa88b60c4d872b057e9e7651b351d54affa40e.tar.gz
current-32fa88b60c4d872b057e9e7651b351d54affa40e.tar.xz
Mon Feb 21 20:21:38 UTC 202220220221202138
a/aaa_glibc-solibs-2.35-x86_64-1.txz: Upgraded. a/kernel-firmware-20220218_c53073d-noarch-1.txz: Upgraded. ap/flac-1.3.4-x86_64-1.txz: Upgraded. This update fixes overflow issues with encoding and decoding. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0499 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-0561 (* Security fix *) ap/ksh93-1.0_20220219_bc6c5dbd-x86_64-1.txz: Upgraded. ap/mariadb-10.6.7-x86_64-2.txz: Rebuilt. Removed dangling symlink. ap/vim-8.2.4428-x86_64-1.txz: Upgraded. Patched ctags for glibc-2.35. Thanks to nobodino. d/autoconf-2.71-noarch-1.txz: Upgraded. d/automake-1.16.5-noarch-1.txz: Upgraded. d/binutils-2.38-x86_64-2.txz: Rebuilt. Fixed the SlackBuild to not run autoconf in the libiberty and intl subdirectories. It doesn't work with the latest autoconf, and there doesn't seem to be any need for it anyway. d/cmake-3.22.2-x86_64-1.txz: Upgraded. d/meson-0.61.2-x86_64-1.txz: Upgraded. d/rcs-5.10.0-x86_64-4.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. d/scons-4.3.0-x86_64-1.txz: Upgraded. e/emacs-27.2-x86_64-2.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. kde/digikam-7.5.0-x86_64-2.txz: Rebuilt. Recompiled against jasper-3.0.2. kde/wacomtablet-20220124_dd28b27-x86_64-1.txz: Upgraded. l/LibRaw-0.20.2-x86_64-4.txz: Rebuilt. Recompiled against jasper-3.0.2. l/accountsservice-22.07.5-x86_64-1.txz: Upgraded. l/dconf-editor-3.38.3-x86_64-2.txz: Rebuilt. Fixed build errors with meson. l/expat-2.4.6-x86_64-1.txz: Upgraded. l/fuse-2.9.9-x86_64-4.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. l/gcr-3.40.0-x86_64-2.txz: Rebuilt. Fixed build errors with meson. l/gdk-pixbuf2-2.42.6-x86_64-2.txz: Rebuilt. Fixed meson options. l/gdk-pixbuf2-xlib-2.40.2-x86_64-4.txz: Rebuilt. Fixed meson options. l/gegl-0.4.34-x86_64-3.txz: Rebuilt. Recompiled against jasper-3.0.2. l/glade-3.38.2-x86_64-6.txz: Rebuilt. Fixed build errors with meson. Removed duplicated 'da' from help/LINGUAS. l/glibc-2.35-x86_64-1.txz: Upgraded. l/glibc-i18n-2.35-x86_64-1.txz: Upgraded. l/glibc-profile-2.35-x86_64-1.txz: Upgraded. l/gobject-introspection-1.71.0-x86_64-1.txz: Upgraded. This update was needed to solve failing tests with the new meson. l/gtk+2-2.24.33-x86_64-3.txz: Rebuilt. Changed build/host to $ARCH-slackware-linux-gnu. l/gtk4-4.4.1-x86_64-2.txz: Rebuilt. Fixed meson options. l/gvfs-1.48.1-x86_64-2.txz: Rebuilt. Fixed build errors with meson. l/imagemagick-7.1.0_26-x86_64-1.txz: Upgraded. l/jasper-3.0.2-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/json-glib-1.6.6-x86_64-2.txz: Rebuilt. Fixed meson options. l/libsecret-0.20.5-x86_64-1.txz: Upgraded. l/netpbm-10.97.04-x86_64-1.txz: Upgraded. l/qt5-5.15.3_20211130_014c375b-x86_64-3.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. Recompiled against jasper-3.0.2. l/shared-mime-info-2.1-x86_64-4.txz: Rebuilt. Fixed build errors with meson. n/gpgme-1.17.0-x86_64-1.txz: Upgraded. n/ntp-4.2.8p15-x86_64-9.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. x/libinput-1.19.3-x86_64-2.txz: Rebuilt. Recompiled against libwacom-2.1.0. x/libva-2.14.0-x86_64-1.txz: Upgraded. x/libva-utils-2.14.0-x86_64-1.txz: Upgraded. x/libwacom-2.1.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. x/motif-2.3.8-x86_64-6.txz: Rebuilt. Fixed build with LEXLIB="-lfl". x/vulkan-sdk-1.2.176.1-x86_64-3.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. x/xf86-input-wacom-1.0.0-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.24.0-x86_64-3.txz: Rebuilt. Fixed build errors with meson. xap/vim-gvim-8.2.4428-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/gcr')
-rw-r--r--source/l/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch59
-rwxr-xr-xsource/l/gcr/gcr.SlackBuild8
2 files changed, 64 insertions, 3 deletions
diff --git a/source/l/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/source/l/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
new file mode 100644
index 000000000..548368b7b
--- /dev/null
+++ b/source/l/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
@@ -0,0 +1,59 @@
+From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+ gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
+
+Fixes #89
+---
+ gck/meson.build | 1 -
+ gcr/meson.build | 1 -
+ ui/meson.build | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/gck/meson.build b/gck/meson.build
+index 756b4866..a21a1e9d 100644
+--- a/gck/meson.build
++++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+ sources: gck_gir_sources,
+ namespace: 'Gck',
+ nsversion: '@0@'.format(gck_major_version),
+- packages: gck_deps,
+ export_packages: 'gck-@0@'.format(gck_major_version),
+ includes: [ 'GObject-2.0', 'Gio-2.0' ],
+ header: 'gck/gck.h',
+diff --git a/gcr/meson.build b/gcr/meson.build
+index 2233a445..c83641ba 100644
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -190,7 +190,6 @@ if get_option('introspection')
+ sources: [ gcr_base_public_sources, gcr_base_headers ],
+ namespace: 'Gcr',
+ nsversion: '@0@'.format(gcr_major_version),
+- packages: gcr_base_deps,
+ export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+ includes: [
+ 'GObject-2.0',
+diff --git a/ui/meson.build b/ui/meson.build
+index e656ea23..32ee057f 100644
+--- a/ui/meson.build
++++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+ export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+ identifier_prefix: 'Gcr',
+ symbol_prefix: 'gcr',
+- packages: gcr_ui_deps,
+ includes: [
+ 'GObject-2.0',
+ 'Gio-2.0',
+--
+GitLab
+
diff --git a/source/l/gcr/gcr.SlackBuild b/source/l/gcr/gcr.SlackBuild
index 857116c79..7325aa2c5 100755
--- a/source/l/gcr/gcr.SlackBuild
+++ b/source/l/gcr/gcr.SlackBuild
@@ -1,8 +1,7 @@
#!/bin/bash
-# Slackware build script for gcr
-
# Copyright 2012 Robby Workman, Northport, Alabama, USA
+# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gcr
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -80,6 +79,9 @@ find . \
# meson.
zcat $CWD/gcr.meson.disable.schemas-compile.update-mime.update-icon-cache.diff.gz | patch -p1 --verbose || exit 1
+# Fix for recent meson:
+zcat $CWD/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch.gz | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"