summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-09-11 21:36:01 +0200
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-09-11 21:39:00 +0200
commit20a584b6a0b564acb0af2b33cf64891247a63ed5 (patch)
treea0ab42612cefc9b9279b380071e810e1a57cb257
parentc7a835cca623ebcc1173d5bc7071124bd643b8cb (diff)
downloadgnome-20a584b6a0b564acb0af2b33cf64891247a63ed5.tar.gz
gnome-20a584b6a0b564acb0af2b33cf64891247a63ed5.tar.xz
gnome-control-center: bump to 3.25.92.1
Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--packages/gnome-desktop/gnome-control-center/files/0001-optionalise-kerberos-based-authentication.patch109
-rw-r--r--packages/gnome-desktop/gnome-control-center/gnome-control-center-3.25.92.1.exheres-0100
2 files changed, 100 insertions, 109 deletions
diff --git a/packages/gnome-desktop/gnome-control-center/files/0001-optionalise-kerberos-based-authentication.patch b/packages/gnome-desktop/gnome-control-center/files/0001-optionalise-kerberos-based-authentication.patch
deleted file mode 100644
index 5153bfa..0000000
--- a/packages/gnome-desktop/gnome-control-center/files/0001-optionalise-kerberos-based-authentication.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From c86c8061707fd832918aea25fac9cba0988c8cf4 Mon Sep 17 00:00:00 2001
-From: Saleem Abdulrasool <compnerd@compnerd.org>
-Date: Sun, 9 Sep 2012 10:48:31 -0700
-Subject: [PATCH] optionalise kerberos based authentication
-
----
- configure.ac | 26 +++++++++++++++-----------
- panels/user-accounts/um-realm-manager.c | 10 ++++++++++
- panels/user-accounts/um-realm-manager.h | 1 +
- 3 files changed, 26 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a0a48a8..2079114 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,18 +257,22 @@ AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes
- ISO_CODES=iso-codes
-
- # Kerberos kerberos support
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
--if test "$KRB5_CONFIG" = "no"; then
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
-+AC_ARG_ENABLE([kerberos],
-+ [AC_HELP_STRING([--disable-kerberos], [disable kerberos support])],,
-+ [enable_kerberos=yes])
-+if test x"$enable_kerberos" = x"yes" ; then
-+ AC_PATH_PROG([KRB5_CONFIG], [krb5-config],
-+ [AC_MSG_ERROR([krb5-config executable not found in your path])])
-+
-+ AC_MSG_CHECKING([for krb5 libraries and flags])
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`"
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+
-+ AC_SUBST([KRB5_CFLAGS])
-+ AC_SUBST([KRB5_LIBS])
- fi
--
--AC_MSG_CHECKING(for krb5 libraries and flags)
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
--KRB5_LIBS="`$KRB5_CONFIG --libs`"
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
--
--AC_SUBST(KRB5_CFLAGS)
--AC_SUBST(KRB5_LIBS)
-+AM_CONDITIONAL([HAVE_KERBEROS], [test x"$enable_kerberos" = x"yes"])
-
- USER_ACCOUNTS_PANEL_CFLAGS="$USER_ACCOUNTS_PANEL_CFLAGS $KRB5_CFLAGS"
- USER_ACCOUNTS_PANEL_LIBS="$USER_ACCOUNTS_PANEL_LIBS $KRB5_LIBS"
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 301c905..47fe9e7 100644
---- a/panels/user-accounts/um-realm-manager.c
-+++ b/panels/user-accounts/um-realm-manager.c
-@@ -24,7 +24,9 @@
-
- #include "um-realm-manager.h"
-
-+#if defined(HAVE_KERBEROS)
- #include <krb5/krb5.h>
-+#endif
-
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -638,6 +640,7 @@ login_closure_free (gpointer data)
- g_slice_free (LoginClosure, login);
- }
-
-+#if defined(HAVE_KERBEROS)
- static krb5_error_code
- login_perform_kinit (krb5_context k5,
- const gchar *realm,
-@@ -762,6 +765,7 @@ kinit_thread_func (GSimpleAsyncResult *async,
- if (k5)
- krb5_free_context (k5);
- }
-+#endif
-
- void
- um_realm_login (UmRealmObject *realm,
-@@ -793,8 +797,14 @@ um_realm_login (UmRealmObject *realm,
- g_simple_async_result_set_op_res_gpointer (async, login, login_closure_free);
-
- g_simple_async_result_set_handle_cancellation (async, TRUE);
-+#if defined(HAVE_KERBEROS)
- g_simple_async_result_run_in_thread (async, kinit_thread_func,
- G_PRIORITY_DEFAULT, cancellable);
-+#else
-+ g_simple_async_result_set_error (async, UM_REALM_ERROR,
-+ UM_REALM_ERROR_NOT_SUPPORTED,
-+ _("kerberos based authentication support is disabled"));
-+#endif
-
- g_object_unref (async);
- g_object_unref (kerberos);
-diff --git a/panels/user-accounts/um-realm-manager.h b/panels/user-accounts/um-realm-manager.h
-index a604fae..71e2bd3 100644
---- a/panels/user-accounts/um-realm-manager.h
-+++ b/panels/user-accounts/um-realm-manager.h
-@@ -30,6 +30,7 @@ typedef enum {
- UM_REALM_ERROR_BAD_LOGIN,
- UM_REALM_ERROR_BAD_PASSWORD,
- UM_REALM_ERROR_GENERIC,
-+ UM_REALM_ERROR_NOT_SUPPORTED,
- } UmRealmErrors;
-
- #define UM_REALM_ERROR (um_realm_error_get_quark ())
---
-1.7.12
-
diff --git a/packages/gnome-desktop/gnome-control-center/gnome-control-center-3.25.92.1.exheres-0 b/packages/gnome-desktop/gnome-control-center/gnome-control-center-3.25.92.1.exheres-0
new file mode 100644
index 0000000..f17c55d
--- /dev/null
+++ b/packages/gnome-desktop/gnome-control-center/gnome-control-center-3.25.92.1.exheres-0
@@ -0,0 +1,100 @@
+# Copyright 2008 Saleem Abdulrasool <compnerd@compnerd.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require gnome.org [ suffix=tar.xz ] freedesktop-desktop gtk-icon-cache
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 1.12 ] ]
+
+SUMMARY="Configuration Applications for the GNOME Desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENCES="GPL-2"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS="
+ cups [[ description = [ add support for managing printers ] ]]
+ cheese [[ description = [ add support for adding user account images using cheese ] ]]
+ ibus [[ description = [ add support for the IBus input method ] ]]
+ ( linguas: af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs cy da de dz
+ el en en_CA en_GB en@shaw eo es et eu fa fi fr ga gl gu he hi hr hu hy id ilo is it
+ ja ka kk km kn ko ku ky lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc or pa
+ pl pt pt_BR ro ru rw si sk sl sq sr sr@latin sv ta te tg th tr ug uk ur uz uz@cyrillic
+ vi wa xh zh_CN zh_HK zh_TW zu )
+"
+
+DEPENDENCIES="
+ build:
+ dev-util/intltool[>=0.40.1]
+ virtual/pkg-config[>=0.20]
+ build+run:
+ x11-libs/libX11
+ media-libs/libcanberra[providers:gtk3][>=0.13]
+ x11-libs/gdk-pixbuf:2.0[>=2.23.0]
+ x11-dri/mesa [[ note = [ provides libGL ] ]]
+ dev-libs/libpwquality[>=1.2.2]
+ sys-apps/accountsservice[>=0.6.39]
+ x11-libs/libXxf86misc
+ x11-libs/gtk+:3[>=3.22.0]
+ dev-libs/glib:2[>=2.53.0]
+ dev-libs/libxml2:2.0
+ gnome-desktop/gsettings-desktop-schemas[>=3.23.90]
+ gnome-desktop/gnome-desktop:3.0[>=3.21.3]
+ x11-libs/clutter:1[>=1.11.3][?X]
+ media-libs/fontconfig
+ net-apps/NetworkManager[>=1.2.0]
+ net-wireless/ModemManager[>=0.7]
+ gnome-desktop/network-manager-applet[>=1.2.0] [[
+ note = [ required for network applet ]
+ ]]
+ gnome-desktop/gnome-bluetooth:1[>=3.18.2]
+ gnome-desktop/gnome-online-accounts[>=3.25.3]
+ gnome-desktop/grilo:0.3[>=0.3.0]
+
+ gnome-desktop/colord-gtk[>=0.1.24]
+ gnome-desktop/gnome-settings-daemon:3.0[>=3.25.90]
+ gnome-desktop/libgnomekbd[>=2.91.91]
+ gnome-desktop/libgtop:2
+ gnome-desktop/libgudev
+ gnome-desktop/libsoup:2.4
+ media-sound/pulseaudio[>=2.0]
+ sys-apps/colord[>=0.1.34]
+ sys-apps/upower[>=0.99.0]
+ sys-auth/polkit:1[>=0.103]
+ x11-libs/clutter-gtk:1.0
+ x11-libs/libwacom[>=0.7]
+ x11-libs/libXi[>=1.2]
+ x11-libs/libX11
+ cheese? ( gnome-desktop/cheese[>=3.5.91] )
+ cups? ( net-print/cups[>=1.4]
+ net-fs/samba )
+ ibus? ( inputmethods/ibus[>=1.5.2] )
+"
+
+AM_OPTS=( --foreign )
+AT_M4DIR=( m4 libgd )
+
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/3.24/* )
+
+DEFAULT_SRC_CONFIGURE_PARAMS=(
+ --prefix=/usr
+ --exec_prefix=/usr/$(exhost --target)
+ --disable-update-mimedb
+ --disable-kerberos
+)
+DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'cups' 'ibus' )
+DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'cheese' )
+
+src_prepare() {
+ autotools_src_prepare
+ edo intltoolize --force --copy
+}
+
+pkg_postinst() {
+ freedesktop-desktop_update_desktop_database
+ gtk-icon-cache_pkg_postinst
+}
+
+pkg_postrm() {
+ freedesktop-desktop_update_desktop_database
+ gtk-icon-cache_pkg_postrm
+}
+