[150440] users/devans/GNOME-3/unstable/dports/gnome
devans at macports.org
devans at macports.org
Tue Jul 19 01:55:48 PDT 2016
Revision: 150440
https://trac.macports.org/changeset/150440
Author: devans at macports.org
Date: 2016-07-19 01:55:47 -0700 (Tue, 19 Jul 2016)
Log Message:
-----------
GNOME-3/unstable: gnome-session, copy from stable and update to unstable version 3.21.3, patches, use gnome unstable livecheck.
Modified Paths:
--------------
users/devans/GNOME-3/unstable/dports/gnome/gnome-session/Portfile
users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-configure.ac.diff
users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
Added Paths:
-----------
users/devans/GNOME-3/unstable/dports/gnome/gnome-session/
users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff
users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-tools-Makefile.am.diff
Removed Paths:
-------------
users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff
Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-session/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile 2016-06-14 18:47:01 UTC (rev 149362)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-session/Portfile 2016-07-19 08:55:47 UTC (rev 150440)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-session
-version 3.20.1
+version 3.21.3
license LGPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description Session component for the GNOME 3 desktop.
@@ -18,8 +18,8 @@
use_xz yes
-checksums rmd160 6380f6b9cee0639a5e517a176e4a4933713216e3 \
- sha256 2ae9f53dc74f851222fbefbe0dc08db0a78cc76ceeb156f92ebd4d40fd038913
+checksums rmd160 6012b63d82542f93da206bb06a545ffafdec71a0 \
+ sha256 95936f574d27fb737c96ac5b07d773e00f0951923add73f81e8e56cb4d357d8b
depends_build port:pkgconfig \
port:intltool \
@@ -50,8 +50,9 @@
depends_run port:gnome-themes-standard
patchfiles patch-configure.ac.diff \
+ patch-tools-Makefile.am.diff \
patch-gnome-session-main.c.diff \
- patch-gnome-session-check-accelerated-helper.c.diff \
+ patch-gnome-session-check-accelerated-gl-helper.c.diff \
patch-header-guard-typo.diff
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
@@ -85,4 +86,4 @@
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
-livecheck.type gnome
+livecheck.type gnome-with-unstable
Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-configure.ac.diff 2016-06-14 18:47:01 UTC (rev 149362)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-configure.ac.diff 2016-07-19 08:55:47 UTC (rev 150440)
@@ -1,11 +1,20 @@
---- configure.ac.orig 2015-05-02 11:15:33.000000000 -0700
-+++ configure.ac 2015-05-02 11:18:36.000000000 -0700
-@@ -97,7 +97,8 @@
+--- configure.ac.orig 2016-06-20 12:41:43.000000000 -0700
++++ configure.ac 2016-06-23 13:19:03.000000000 -0700
+@@ -86,7 +86,7 @@
+ PKG_CHECK_MODULES(XEXT, xext xau)
+
+ PKG_CHECK_MODULES(GL_TEST, xcomposite gl glib-2.0)
+-PKG_CHECK_MODULES(GLES_TEST, egl glesv2)
++dnl PKG_CHECK_MODULES(GLES_TEST, egl glesv2)
+
+ dnl ====================================================================
+ dnl Check for gconf
+@@ -96,7 +96,8 @@
[enable_gconf=$enableval],
[enable_gconf=auto])
-PKG_CHECK_MODULES(GCONF, gconf-2.0, [have_gconf=yes], [have_gconf=no])
-+#PKG_CHECK_MODULES(GCONF, gconf-2.0, [have_gconf=yes], [have_gconf=no])
++dnl PKG_CHECK_MODULES(GCONF, gconf-2.0, [have_gconf=yes], [have_gconf=no])
+have_gconf=no
if test x$enable_gconf = xauto ; then
Copied: users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff (from rev 149362, users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff)
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff 2016-07-19 08:55:47 UTC (rev 150440)
@@ -0,0 +1,122 @@
+--- tools/gnome-session-check-accelerated-gl-helper.c.orig 2016-05-26 14:04:18.000000000 -0700
++++ tools/gnome-session-check-accelerated-gl-helper.c 2016-06-23 12:49:07.000000000 -0700
+@@ -87,6 +87,75 @@
+
+ #include "gnome-session-check-accelerated-common.h"
+
++#ifdef __APPLE__
++#include <Availability.h>
++#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
++
++static const int line_size = 128;
++
++static ssize_t
++getdelim (char **lineptr, size_t *n, int delim, FILE *stream);
++
++static ssize_t
++getline (char **lineptr, size_t *n, FILE *stream);
++
++static ssize_t
++getdelim (char **lineptr, size_t *n, int delim, FILE *stream)
++{
++ int indx = 0;
++ int c;
++
++ /* Sanity checks. */
++ if (lineptr == NULL || n == NULL || stream == NULL)
++ return -1;
++
++ /* Allocate the line the first time. */
++ if (*lineptr == NULL)
++ {
++ *lineptr = malloc (line_size);
++ if (*lineptr == NULL)
++ return -1;
++ *n = line_size;
++ }
++
++ /* Clear the line. */
++ memset (*lineptr, '\0', *n);
++
++ while ((c = getc (stream)) != EOF)
++ {
++ /* Check if more memory is needed. */
++ if (indx >= *n)
++ {
++ *lineptr = realloc (*lineptr, *n + line_size);
++ if (*lineptr == NULL)
++ {
++ return -1;
++ }
++ /* Clear the rest of the line. */
++ memset(*lineptr + *n, '\0', line_size);
++ *n += line_size;
++ }
++
++ /* Push the result in the line. */
++ (*lineptr)[indx++] = c;
++
++ /* Bail out. */
++ if (c == delim)
++ {
++ break;
++ }
++ }
++ return (c == EOF) ? -1 : indx;
++}
++
++static ssize_t
++getline (char **lineptr, size_t *n, FILE *stream)
++{
++ return getdelim (lineptr, n, '\n', stream);
++}
++#endif
++#endif
++
+ #define SIZE_UNSET 0
+ #define SIZE_ERROR -1
+ static int max_texture_size = SIZE_UNSET;
+@@ -447,26 +516,42 @@
+ _print_error ("No X display.");
+ goto out;
+ }
+-
++/*
++ * Mac OS X always fails these checks due to the following
++ * - No composite extension
++ * - No GLX_EXT_texture_from_pixmap support
++ * This is mainly for gnome-shell which we don't support yet.
++ * For now, print the error but allow gnome-session to
++ * continue to start up. We'll deal with any consequences
++ * down the line.
++ */
+ if (!_has_composite (display)) {
+ _print_error ("No composite extension.");
++#ifndef __APPLE__
+ goto out;
++#endif
+ }
+
+ renderer = _get_hardware_gl (display);
+ if (!renderer) {
+ _print_error ("No hardware 3D support.");
++#ifndef __APPLE__
+ goto out;
++#endif
+ }
+
+ if (!_has_texture_from_pixmap (display)) {
+ _print_error ("No GLX_EXT_texture_from_pixmap support.");
++#ifndef __APPLE__
+ goto out;
++#endif
+ }
+
+ if (!_is_max_texture_size_big_enough (display)) {
+ _print_error ("GL_MAX_{TEXTURE,RENDERBUFFER}_SIZE is too small.");
++#ifndef __APPLE__
+ goto out;
++#endif
+ }
+
+ if (has_llvmpipe) {
Deleted: users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff 2016-06-14 18:47:01 UTC (rev 149362)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff 2016-07-19 08:55:47 UTC (rev 150440)
@@ -1,120 +0,0 @@
---- tools/gnome-session-check-accelerated-helper.c.orig 2013-10-04 19:29:25.000000000 -0700
-+++ tools/gnome-session-check-accelerated-helper.c 2013-12-20 12:45:20.000000000 -0800
-@@ -86,6 +86,75 @@
-
- #include "gnome-session-check-accelerated-common.h"
-
-+#ifdef __APPLE__
-+#include <Availability.h>
-+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
-+
-+static const int line_size = 128;
-+
-+static ssize_t
-+getdelim (char **lineptr, size_t *n, int delim, FILE *stream);
-+
-+static ssize_t
-+getline (char **lineptr, size_t *n, FILE *stream);
-+
-+static ssize_t
-+getdelim (char **lineptr, size_t *n, int delim, FILE *stream)
-+{
-+ int indx = 0;
-+ int c;
-+
-+ /* Sanity checks. */
-+ if (lineptr == NULL || n == NULL || stream == NULL)
-+ return -1;
-+
-+ /* Allocate the line the first time. */
-+ if (*lineptr == NULL)
-+ {
-+ *lineptr = malloc (line_size);
-+ if (*lineptr == NULL)
-+ return -1;
-+ *n = line_size;
-+ }
-+
-+ /* Clear the line. */
-+ memset (*lineptr, '\0', *n);
-+
-+ while ((c = getc (stream)) != EOF)
-+ {
-+ /* Check if more memory is needed. */
-+ if (indx >= *n)
-+ {
-+ *lineptr = realloc (*lineptr, *n + line_size);
-+ if (*lineptr == NULL)
-+ {
-+ return -1;
-+ }
-+ /* Clear the rest of the line. */
-+ memset(*lineptr + *n, '\0', line_size);
-+ *n += line_size;
-+ }
-+
-+ /* Push the result in the line. */
-+ (*lineptr)[indx++] = c;
-+
-+ /* Bail out. */
-+ if (c == delim)
-+ {
-+ break;
-+ }
-+ }
-+ return (c == EOF) ? -1 : indx;
-+}
-+
-+static ssize_t
-+getline (char **lineptr, size_t *n, FILE *stream)
-+{
-+ return getdelim (lineptr, n, '\n', stream);
-+}
-+#endif
-+#endif
-+
- #define SIZE_UNSET 0
- #define SIZE_ERROR -1
- static int max_texture_size = SIZE_UNSET;
-@@ -427,24 +496,41 @@
- goto out;
- }
-
-+/*
-+ * Mac OS X always fails these checks due to the following
-+ * - No composite extension
-+ * - No GLX_EXT_texture_from_pixmap support
-+ * This is mainly for gnome-shell which we don't support yet.
-+ * For now, print the error but allow gnome-session to
-+ * continue to start up. We'll deal with any consequences
-+ * down the line.
-+ */
- if (!_has_composite (display)) {
- _print_error ("No composite extension.");
-+#ifndef __APPLE__
- goto out;
-+#endif
- }
-
- if (!_has_hardware_gl (display)) {
- _print_error ("No hardware 3D support.");
-+#ifndef __APPLE__
- goto out;
-+#endif
- }
-
- if (!_has_texture_from_pixmap (display)) {
- _print_error ("No GLX_EXT_texture_from_pixmap support.");
-+#ifndef __APPLE__
- goto out;
-+#endif
- }
-
- if (!_is_max_texture_size_big_enough (display)) {
- _print_error ("GL_MAX_{TEXTURE,RENDERBUFFER}_SIZE is too small.");
-+#ifndef __APPLE__
- goto out;
-+#endif
- }
-
- if (has_llvmpipe) {
Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff 2016-06-14 18:47:01 UTC (rev 149362)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff 2016-07-19 08:55:47 UTC (rev 150440)
@@ -1,6 +1,6 @@
--- gnome-session/main.c.orig 2016-01-21 07:05:18.000000000 -0800
+++ gnome-session/main.c 2016-01-22 22:47:15.000000000 -0800
-@@ -180,6 +180,14 @@
+@@ -182,6 +182,14 @@
if (g_getenv ("DBUS_SESSION_BUS_ADDRESS"))
return TRUE;
@@ -15,7 +15,7 @@
/* Just a sanity check to prevent infinite recursion if
* dbus-launch fails to set DBUS_SESSION_BUS_ADDRESS
*/
-@@ -204,6 +212,7 @@
+@@ -206,6 +214,7 @@
g_strerror (errno));
return FALSE;
}
@@ -23,7 +23,7 @@
/* Should not be reached */
return TRUE;
-@@ -265,6 +274,17 @@
+@@ -267,6 +276,17 @@
}
}
Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-tools-Makefile.am.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-tools-Makefile.am.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-tools-Makefile.am.diff 2016-07-19 08:55:47 UTC (rev 150440)
@@ -0,0 +1,45 @@
+--- tools/Makefile.am.orig 2016-05-26 14:04:18.000000000 -0700
++++ tools/Makefile.am 2016-06-23 14:07:01.000000000 -0700
+@@ -1,8 +1,7 @@
+ bin_PROGRAMS = gnome-session-quit gnome-session-inhibit
+ libexec_PROGRAMS = \
+ gnome-session-check-accelerated \
+- gnome-session-check-accelerated-gl-helper \
+- gnome-session-check-accelerated-gles-helper
++ gnome-session-check-accelerated-gl-helper
+
+ if BUILD_SESSION_SELECTOR
+ bin_PROGRAMS += gnome-session-selector
+@@ -44,19 +43,19 @@
+ gnome_session_inhibit_LDADD = \
+ $(GNOME_SESSION_LIBS)
+
+-gnome_session_check_accelerated_gles_helper_SOURCES = \
+- gnome-session-check-accelerated-common.h \
+- gnome-session-check-accelerated-gles-helper.c
+-
+-gnome_session_check_accelerated_gles_helper_CPPFLAGS = \
+- -DPKGDATADIR=\""$(pkgdatadir)"\" \
+- $(GLES_TEST_CFLAGS) \
+- $(GTK3_CFLAGS)
+-
+-gnome_session_check_accelerated_gles_helper_LDADD = \
+- $(GLES_TEST_LIBS) \
+- $(GTK3_LIBS) \
+- $(X11_LIBS)
++# gnome_session_check_accelerated_gles_helper_SOURCES = \
++# gnome-session-check-accelerated-common.h \
++# gnome-session-check-accelerated-gles-helper.c
++#
++#gnome_session_check_accelerated_gles_helper_CPPFLAGS = \
++# -DPKGDATADIR=\""$(pkgdatadir)"\" \
++# $(GLES_TEST_CFLAGS) \
++# $(GTK3_CFLAGS)
++#
++#gnome_session_check_accelerated_gles_helper_LDADD = \
++# $(GLES_TEST_LIBS) \
++# $(GTK3_LIBS) \
++# $(X11_LIBS)
+
+ gnome_session_check_accelerated_gl_helper_SOURCES = \
+ gnome-session-check-accelerated-common.h \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160719/1c15943d/attachment-0001.html>
More information about the macports-changes
mailing list