diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /gnome-extra/cinnamon-session/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'gnome-extra/cinnamon-session/files')
-rw-r--r-- | gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch | 33 | ||||
-rw-r--r-- | gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch | 50 |
2 files changed, 83 insertions, 0 deletions
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch new file mode 100644 index 000000000000..76246802e22a --- /dev/null +++ b/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch @@ -0,0 +1,33 @@ +From 2f88efdaaefefabcc16d13f2ae63f57244de01ce Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Mon, 5 May 2014 22:34:14 -0400 +Subject: [PATCH] Make old upower check non-automagic + +--- + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ec4ffac..a122872 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -58,7 +58,15 @@ PKG_CHECK_MODULES(CINNAMON_SESSION, + + dnl We can only support old upower + dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383 +-PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) ++AC_ARG_ENABLE([old-upower], ++ AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]), ++ [enable_old_upower=$enableval], ++ [enable_old_upower=auto]) ++ ++have_old_upower=no ++if test x$enable_old_upower != xno ; then ++ PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) ++fi + AS_IF([test x$have_old_upower = xyes], [ + AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower]) + ]) +-- +1.9.2 + diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch new file mode 100644 index 000000000000..48843728f4ae --- /dev/null +++ b/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch @@ -0,0 +1,50 @@ +From 586c07b431e9b0e1f11a9017ee0b84dc9b8ec08a Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Mon, 5 May 2014 22:34:14 -0400 +Subject: [PATCH] Make logind and old upower check non-automagic + +--- + configure.ac | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f6fa7a..6e908cc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,15 @@ PKG_CHECK_MODULES(CINNAMON_SESSION, + + dnl We can only support old upower + dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383 +-PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) ++AC_ARG_ENABLE([old-upower], ++ AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]), ++ [enable_old_upower=$enableval], ++ [enable_old_upower=auto]) ++ ++have_old_upower=no ++if test x$enable_old_upower != xno ; then ++ PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) ++fi + AS_IF([test x$have_old_upower = xyes], [ + AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower]) + ]) +@@ -96,7 +104,15 @@ dnl ==================================================================== + dnl Check for logind + dnl ==================================================================== + +-PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login >= 183], [have_logind=yes], [have_logind=no]) ++AC_ARG_ENABLE([logind], ++ AS_HELP_STRING([--disable-logind], [Do not check for logind]), ++ [enable_logind=$enableval], ++ [enable_logind=auto]) ++ ++have_logind=no ++if test x$enable_logind != xno ; then ++ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login >= 183], [have_logind=yes], [have_logind=no]) ++fi + + if test x$have_logind = xyes; then + AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported]) +-- +2.4.3 + |