[132280] users/devans/GNOME-3/unstable/dports/gnome
devans at macports.org
devans at macports.org
Wed Jan 28 13:22:30 PST 2015
Revision: 132280
https://trac.macports.org/changeset/132280
Author: devans at macports.org
Date: 2015-01-28 13:22:29 -0800 (Wed, 28 Jan 2015)
Log Message:
-----------
GNOME-3/unstable: gnome-control-center, update to unstable version 3.15.4, backport upstream build fix.
Modified Paths:
--------------
users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/Portfile
Added Paths:
-----------
users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/
users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-fix-non-linux-build.diff
Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2015-01-24 10:30:51 UTC (rev 132143)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/Portfile 2015-01-28 21:22:29 UTC (rev 132280)
@@ -8,7 +8,7 @@
if {${os.platform} eq "darwin" && ${os.major} >= 13} {
set mavericks_or_better yes
- version 3.14.2
+ version 3.15.4
} else {
@@ -33,8 +33,8 @@
if {$mavericks_or_better} {
- checksums rmd160 7d0fce9469ce7e02fc09a2731bd984a5f3ddc863 \
- sha256 b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a
+ checksums rmd160 a1b964999498dfa2128e65317c8830e200bb18d7 \
+ sha256 d12a34b24a67746ba7b9db81c9ef3dacfac3bf11506c8d73bdb57f598c2a02aa
depends_build port:pkgconfig \
port:intltool \
@@ -70,7 +70,8 @@
patchfiles patch-disable-color-panel.diff \
patch-disable-shell-test-hostname.diff \
- patch-panels-user-accounts.diff
+ patch-panels-user-accounts.diff \
+ patch-fix-non-linux-build.diff
pre-configure {
copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
@@ -176,7 +177,7 @@
if {$mavericks_or_better} {
- livecheck.type gnome
+ livecheck.type gnome-with-unstable
} else {
Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-fix-non-linux-build.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-fix-non-linux-build.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-fix-non-linux-build.diff 2015-01-28 21:22:29 UTC (rev 132280)
@@ -0,0 +1,31 @@
+From 9140b47fe370f95878a7599957394bd2dd83da8f Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Thu, 22 Jan 2015 15:48:31 +0100
+Subject: common: Fix build on non-Linux systems
+
+Only define HAVE_WAYLAND when GDK_WINDOWING_WAYLAND is defined.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=743266
+
+diff --git a/panels/common/gnome-settings-bus.h b/panels/common/gnome-settings-bus.h
+index 0698f01..ce58f58 100644
+--- panels/common/gnome-settings-bus.h
++++ panels/common/gnome-settings-bus.h
+@@ -3,6 +3,8 @@
+
+ #include <gdk/gdkx.h>
+
++#ifdef GDK_WINDOWING_WAYLAND
++
+ #define HAVE_WAYLAND 1
+
+ static inline gboolean
+@@ -10,3 +12,5 @@ gnome_settings_is_wayland (void)
+ {
+ return !GDK_IS_X11_DISPLAY (gdk_display_get_default ());
+ }
++
++#endif /* GDK_WINDOWING_WAYLAND */
+--
+cgit v0.10.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150128/7c3ece38/attachment.html>
More information about the macports-changes
mailing list