pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mutter: pkglint, exact BUILDLINK API dependency, commented patches



Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Wed Apr 14 10:13:18 2021 +0200
Changeset:	6f605fa767c0288bdfc94a34054e2223d59a3070

Modified Files:
	mutter/Makefile
	mutter/distinfo
	mutter/patches/patch-src_backends_x11_meta-input-settings-x11.c
	mutter/patches/patch-src_backends_x11_meta-seat-x11.c

Log Message:
mutter: pkglint, exact BUILDLINK API dependency, commented patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6f605fa767c0288bdfc94a34054e2223d59a3070

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mutter/Makefile                                                 | 2 ++
 mutter/distinfo                                                 | 4 ++--
 mutter/patches/patch-src_backends_x11_meta-input-settings-x11.c | 4 +++-
 mutter/patches/patch-src_backends_x11_meta-seat-x11.c           | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diffs:
diff --git a/mutter/Makefile b/mutter/Makefile
index 1242ae67c3..4e3e80a3f0 100644
--- a/mutter/Makefile
+++ b/mutter/Makefile
@@ -12,6 +12,7 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=		msgfmt pkg-config
 TOOL_DEPENDS+=		gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+BUILD_DEFS+=		PKG_SYSCONFBASE
 
 .include "../../graphics/MesaLib/features.mk"
 
@@ -66,6 +67,7 @@ REQD_FILES+=		${EGDIR}/X11/xinit/xinitrc.d/90-mutter \
 			${PKG_SYSCONFBASE}/X11/xinit/xinitrc.d/90-mutter
 
 .include "../../devel/meson/build.mk"
+BUILDLINK_API_DEPENDS.glib2+=				glib2>=2.67.3
 .include "../../devel/glib2/schemas.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
diff --git a/mutter/distinfo b/mutter/distinfo
index a86d10533e..c4ad9c3209 100644
--- a/mutter/distinfo
+++ b/mutter/distinfo
@@ -7,5 +7,5 @@ Size (mutter-40.0.tar.xz) = 2678364 bytes
 SHA1 (patch-clutter_clutter_clutter-stage-view.c) = abba7a702a612457ba56acf1ecfd9396d28d1a2c
 SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.c) = 75547ffc2560860b6101a19165a3659bf799104e
 SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.h) = 311de2a52624c081bd5baf4a6f878a6f1ebd4015
-SHA1 (patch-src_backends_x11_meta-input-settings-x11.c) = 74b4887c1f1162bc5c1ae597f8554133ec770503
-SHA1 (patch-src_backends_x11_meta-seat-x11.c) = 552b83f575ea8bc65d3e0efbdaf25ce90a31b5df
+SHA1 (patch-src_backends_x11_meta-input-settings-x11.c) = 7064b65f4eff933157464a412bfbc2e3525c2472
+SHA1 (patch-src_backends_x11_meta-seat-x11.c) = 249e3d6060ac8faf4a0767acd7ef8e9b4d96a9fd
diff --git a/mutter/patches/patch-src_backends_x11_meta-input-settings-x11.c b/mutter/patches/patch-src_backends_x11_meta-input-settings-x11.c
index 923e4292c8..5ef4f35978 100644
--- a/mutter/patches/patch-src_backends_x11_meta-input-settings-x11.c
+++ b/mutter/patches/patch-src_backends_x11_meta-input-settings-x11.c
@@ -1,12 +1,14 @@
 $NetBSD$
 
+Fix #ifdefs to avoid initialization error on non-Linux
+
 --- src/backends/x11/meta-input-settings-x11.c.orig	2021-03-20 12:08:54.064907300 +0000
 +++ src/backends/x11/meta-input-settings-x11.c
 @@ -45,6 +45,7 @@ typedef struct _MetaInputSettingsX11Priv
  #ifdef HAVE_LIBGUDEV
    GUdevClient *udev_client;
  #endif
-+  bool dummy_field;
++  bool dummy_field; // struct needs at least one element to compile
  } MetaInputSettingsX11Private;
  
  G_DEFINE_TYPE_WITH_PRIVATE (MetaInputSettingsX11, meta_input_settings_x11,
diff --git a/mutter/patches/patch-src_backends_x11_meta-seat-x11.c b/mutter/patches/patch-src_backends_x11_meta-seat-x11.c
index 34aac3b3f3..7011d2aac1 100644
--- a/mutter/patches/patch-src_backends_x11_meta-seat-x11.c
+++ b/mutter/patches/patch-src_backends_x11_meta-seat-x11.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Hide Linux-specific evdev code under #ifdefs
+
 --- src/backends/x11/meta-seat-x11.c.orig	2021-03-20 12:08:54.069907200 +0000
 +++ src/backends/x11/meta-seat-x11.c
 @@ -17,8 +17,9 @@


Home | Main Index | Thread Index | Old Index