Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1937da38cfca2f37a7d11651aa10a68a384b3a3d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1937da38cfca2f37a7d11651aa10a68a384b3a3d)
  • Date: Mon, 5 Dec 2022 01:09:26 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

x11-toolkits/gtk+3/0001-Suppress-compiler-warning.patch |
24 -----
x11-toolkits/gtk+3/DEPENDS |
1
x11-toolkits/gtk+3/HISTORY |
6 +
x11-toolkits/gtk+3/PRE_BUILD |
2
x11-toolkits/gtk+3/patches/0001-Suppress-compiler-warning.patch |
24 +++++
x11-toolkits/gtk+3/patches/0002-Dist-gdk-wayland-cursor-meson.build.patch |
43 ++++++++++
6 files changed, 75 insertions(+), 25 deletions(-)

New commits:
commit 1937da38cfca2f37a7d11651aa10a68a384b3a3d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

x11-toolkits/gtk+3: fixed missing function in DEPENDS and missing file in
tarball problems

diff --git a/x11-toolkits/gtk+3/0001-Suppress-compiler-warning.patch
b/x11-toolkits/gtk+3/0001-Suppress-compiler-warning.patch
deleted file mode 100644
index 49558db..0000000
--- a/x11-toolkits/gtk+3/0001-Suppress-compiler-warning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3e53a28e7810f40773ec8f2dbc239474a356cbf8 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sat, 29 May 2021 13:51:48 +0200
-Subject: [PATCH] Suppress compiler warning
-
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index cbd820d..0438f6c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -309,7 +309,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
- '-Werror=sequence-point',
- '-Werror=return-type',
- '-Werror=trigraphs',
-- '-Werror=array-bounds',
- '-Werror=write-strings',
- '-Werror=address',
- '-Werror=int-to-pointer-cast',
---
-2.31.1
-
diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
index 38ffe74..69e6c3f 100755
--- a/x11-toolkits/gtk+3/DEPENDS
+++ b/x11-toolkits/gtk+3/DEPENDS
@@ -1,3 +1,4 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
. "$GRIMOIRE"/VDEPENDS &&
. "${GRIMOIRE}/MESON_DEPENDS" &&

diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index f7b406b..18f0412 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,9 @@
+2022-12-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: included grimoire FUNCTIONS (is_version_less needs it)
+ * PRE_BUILD, patches{0001-Suppress-compiler-warning,
+ 0002-Dist-gdk-wayland-cursor-meson.build}.patch: moved 0001 patch,
added
+ second patch to fix missing meson.build error
+
2022-12-04 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 3.24.35

diff --git a/x11-toolkits/gtk+3/PRE_BUILD b/x11-toolkits/gtk+3/PRE_BUILD
index 62591c2..3357329 100755
--- a/x11-toolkits/gtk+3/PRE_BUILD
+++ b/x11-toolkits/gtk+3/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p1 < "$SPELL_DIRECTORY/0001-Suppress-compiler-warning.patch"
+apply_patch_dir patches
diff --git a/x11-toolkits/gtk+3/patches/0001-Suppress-compiler-warning.patch
b/x11-toolkits/gtk+3/patches/0001-Suppress-compiler-warning.patch
new file mode 100644
index 0000000..49558db
--- /dev/null
+++ b/x11-toolkits/gtk+3/patches/0001-Suppress-compiler-warning.patch
@@ -0,0 +1,24 @@
+From 3e53a28e7810f40773ec8f2dbc239474a356cbf8 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sat, 29 May 2021 13:51:48 +0200
+Subject: [PATCH] Suppress compiler warning
+
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index cbd820d..0438f6c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -309,7 +309,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
+ '-Werror=sequence-point',
+ '-Werror=return-type',
+ '-Werror=trigraphs',
+- '-Werror=array-bounds',
+ '-Werror=write-strings',
+ '-Werror=address',
+ '-Werror=int-to-pointer-cast',
+--
+2.31.1
+
diff --git
a/x11-toolkits/gtk+3/patches/0002-Dist-gdk-wayland-cursor-meson.build.patch
b/x11-toolkits/gtk+3/patches/0002-Dist-gdk-wayland-cursor-meson.build.patch
new file mode 100644
index 0000000..f1c2f1d
--- /dev/null
+++
b/x11-toolkits/gtk+3/patches/0002-Dist-gdk-wayland-cursor-meson.build.patch
@@ -0,0 +1,43 @@
+From b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen AT redhat.com>
+Date: Wed, 23 Nov 2022 06:24:40 -0500
+Subject: [PATCH] Dist gdk/wayland/cursor/meson.build
+
+This file was missing from the 3.24.35 tarball.
+Oops.
+---
+ gdk/wayland/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
+index 0ad465f6aa..1b06c650b4 100644
+--- a/gdk/wayland/Makefile.am
++++ b/gdk/wayland/Makefile.am
+@@ -128,7 +128,8 @@ xdg-activation-v1-client-protocol.h :
$(WAYLAND_PROTOCOLS_DATADIR)/staging/xdg-a
+ EXTRA_DIST += \
+ protocol/gtk-primary-selection.xml \
+ protocol/gtk-shell.xml \
+- protocol/server-decoration.xml \
++ protocol/server-decoration.xml \
++ cursor/meson.build \
+ meson.build
+
+ -include $(top_srcdir)/git.mk
+diff --git a/gdk/wayland/cursor/meson.build b/gdk/wayland/cursor/meson.build
+new file mode 100644
+index 0000000..02d5f2b
+--- /dev/null
++++ b/gdk/wayland/cursor/meson.build
+@@ -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,
++)



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1937da38cfca2f37a7d11651aa10a68a384b3a3d), Pavel Vinogradov, 12/04/2022

Archive powered by MHonArc 2.6.24.

Top of Page