summaryrefslogtreecommitdiffstats
path: root/source/l/gtk+3
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/gtk+3')
-rw-r--r--source/l/gtk+3/fix.missing.gdk.wayland.cursor.meson.build.diff15
-rwxr-xr-xsource/l/gtk+3/gtk+3.SlackBuild17
-rw-r--r--source/l/gtk+3/gtk.array-bounds.gcc11.diff10
-rw-r--r--source/l/gtk+3/gtk.fix.missing.version-check.py.diff39
4 files changed, 2 insertions, 79 deletions
diff --git a/source/l/gtk+3/fix.missing.gdk.wayland.cursor.meson.build.diff b/source/l/gtk+3/fix.missing.gdk.wayland.cursor.meson.build.diff
deleted file mode 100644
index 610d11079..000000000
--- a/source/l/gtk+3/fix.missing.gdk.wayland.cursor.meson.build.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./gdk/wayland/cursor/meson.build.orig 2022-12-09 12:40:50.120829020 -0600
-+++ ./gdk/wayland/cursor/meson.build 2022-12-09 12:40:50.120829020 -0600
-@@ -0,0 +1,12 @@
-+wayland_cursor_sources = files([
-+ 'wayland-cursor.c',
-+ 'xcursor.c',
-+ 'os-compatibility.c'
-+])
-+
-+libwayland_cursor = static_library('wayland+cursor',
-+ sources: wayland_cursor_sources,
-+ include_directories: [ confinc, ],
-+ dependencies: [ glib_dep, wlclientdep, ],
-+ c_args: common_cflags,
-+)
diff --git a/source/l/gtk+3/gtk+3.SlackBuild b/source/l/gtk+3/gtk+3.SlackBuild
index c8e50c591..6d4702911 100755
--- a/source/l/gtk+3/gtk+3.SlackBuild
+++ b/source/l/gtk+3/gtk+3.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2013, 2018, 2020, 2022 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2018, 2020, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -77,19 +77,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# The version-check.py seems to be missing from the top-level directory, but
-# since we've checked the version numbers manually we'll just fix things so
-# the configure process doesn't try to call it:
-zcat $CWD/gtk.fix.missing.version-check.py.diff.gz | patch -p1 --verbose || exit 1
-
-# Loosen this up for gcc11:
-zcat $CWD/gtk.array-bounds.gcc11.diff.gz | patch -p1 --verbose || exit 1
-
-# If this is missing:
-if [ ! -r gdk/wayland/cursor/meson.build ]; then
- zcat $CWD/fix.missing.gdk.wayland.cursor.meson.build.diff.gz | patch -p1 --verbose || exit 1
-fi
-
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
export CXXFLAGS="$SLKCFLAGS -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
@@ -158,7 +145,7 @@ done
# Copy extra documentation into package.
mkdir -p $PKG/usr/doc/gtk+3-$VERSION
cp -a \
- AUTHORS COPYING NEWS README \
+ AUTHORS* CONTRIBUTING* COPYING* INSTALL* NEWS* README* \
$PKG/usr/doc/gtk+3-$VERSION
( cd $PKG/usr/doc/gtk+3-$VERSION
ln -s /usr/share/gtk-doc/html/gail-libgail-util .
diff --git a/source/l/gtk+3/gtk.array-bounds.gcc11.diff b/source/l/gtk+3/gtk.array-bounds.gcc11.diff
deleted file mode 100644
index 99392a31f..000000000
--- a/source/l/gtk+3/gtk.array-bounds.gcc11.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./meson.build.orig 2021-08-05 23:49:52.169416580 -0500
-+++ ./meson.build 2021-08-05 23:50:01.955416038 -0500
-@@ -309,7 +309,6 @@
- '-Werror=sequence-point',
- '-Werror=return-type',
- '-Werror=trigraphs',
-- '-Werror=array-bounds',
- '-Werror=write-strings',
- '-Werror=address',
- '-Werror=int-to-pointer-cast',
diff --git a/source/l/gtk+3/gtk.fix.missing.version-check.py.diff b/source/l/gtk+3/gtk.fix.missing.version-check.py.diff
deleted file mode 100644
index 296932324..000000000
--- a/source/l/gtk+3/gtk.fix.missing.version-check.py.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./Makefile.in.orig 2020-04-27 09:37:05.000000000 -0500
-+++ ./Makefile.in 2020-04-27 13:08:49.593281753 -0500
-@@ -1241,7 +1241,6 @@
- dist-hook:
- mkdir $(distdir)/subprojects
- cp -p $(srcdir)/subprojects/*.wrap $(distdir)/subprojects
-- $(top_srcdir)/check-version.py $(top_srcdir)/configure.ac $(top_srcdir)/meson.build
-
- distclean-local:
- if test "$(srcdir)" = "."; then :; else \
---- ./meson.build.orig 2020-04-27 09:35:59.000000000 -0500
-+++ ./meson.build 2020-04-27 13:09:29.805285185 -0500
-@@ -987,16 +987,6 @@
- install_dir : join_paths(gtk_datadir, 'gtk-3.0', 'valgrind'))
- endif
-
--test(
-- 'version-check',
-- find_program('check-version.py'),
-- args: [
-- join_paths(meson.current_source_dir(), 'configure.ac'),
-- join_paths(meson.current_source_dir(), 'meson.build'),
-- ],
-- suite: 'gtk',
--)
--
- summary = [
- '',
- '------',
---- ./Makefile.am.orig 2020-04-23 12:14:53.000000000 -0500
-+++ ./Makefile.am 2020-04-27 13:08:28.015279911 -0500
-@@ -84,7 +84,6 @@
- dist-hook:
- mkdir $(distdir)/subprojects
- cp -p $(srcdir)/subprojects/*.wrap $(distdir)/subprojects
-- $(top_srcdir)/check-version.py $(top_srcdir)/configure.ac $(top_srcdir)/meson.build
-
- distclean-local:
- if test "$(srcdir)" = "."; then :; else \