diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2014-12-22 21:36:55 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2014-12-22 21:36:55 +0000 |
commit | ae89aec1686516042de3207c40250b1a92240600 (patch) | |
tree | 2a53b5baeb48026774b832f53f324cae3c36c3ef /gnome-base | |
parent | Version bump for Gnome 3.14. Clean up old revisions. (diff) | |
download | historical-ae89aec1686516042de3207c40250b1a92240600.tar.gz historical-ae89aec1686516042de3207c40250b1a92240600.tar.bz2 historical-ae89aec1686516042de3207c40250b1a92240600.zip |
Version bump for Gnome 3.14.
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/gnome-control-center/ChangeLog | 9 | ||||
-rw-r--r-- | gnome-base/gnome-control-center/Manifest | 15 | ||||
-rw-r--r-- | gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch | 537 | ||||
-rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild | 163 | ||||
-rw-r--r-- | gnome-base/gvfs/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-base/gvfs/Manifest | 10 | ||||
-rw-r--r-- | gnome-base/gvfs/gvfs-1.22.2.ebuild | 119 | ||||
-rw-r--r-- | gnome-base/nautilus/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-base/nautilus/Manifest | 10 | ||||
-rw-r--r-- | gnome-base/nautilus/nautilus-3.14.2.ebuild | 128 |
10 files changed, 993 insertions, 12 deletions
diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog index 0e354236bf3b..ba28cf666170 100644 --- a/gnome-base/gnome-control-center/ChangeLog +++ b/gnome-base/gnome-control-center/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gnome-control-center # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.158 2014/09/26 20:33:12 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.159 2014/12/22 21:35:02 eva Exp $ + +*gnome-control-center-3.14.2 (22 Dec 2014) + + 22 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> + +gnome-control-center-3.14.2.ebuild, + +files/gnome-control-center-3.14.0-optional.patch: + Version bump for Gnome 3.14. 26 Sep 2014; Pacho Ramos <pacho@gentoo.org> -files/gnome-control-center-3.10.2-optional.patch, diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index c2015c79bab2..0faf35879cd7 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,6 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX gnome-control-center-3.10.2-gentoo-paths.patch 4304 SHA256 63a8fd44d0585c141e3207b697266850215ee3e0254621c4aa15ae17469dd385 SHA512 5340686d2e0de699d495d30e6969f5c4fcc5ce735e43d659da326c9445821c6de142b8ab98c858cf7c33c6c2acbbc91aab8d145d32bc2a4a17caef99a09f8623 WHIRLPOOL ff8aac218544b8ea0caa2cd7210129ca5277275a8c7db3846e4ca8e8c5eed6d8ca1e0a9de415d52ab51bf624247bd248442cc18a79fb8ba0f0ec032cef81663d AUX gnome-control-center-3.12.1-optional-r1.patch 19513 SHA256 f28ff1f142031f3a02abb91d4cfae5037f02caec4d11899ac50de35d1631a2c5 SHA512 949c808a34c6df8e66efba945af9561391fab52c32d2b3928361cdffd50f030c8c61f811f7fb1e601127bb38bb788f6a751cf78cd6f3757b255fd89722c3d15b WHIRLPOOL 72b91611ada4ebabf118d9af73511da186f470054533867ea78cc3cade2a4d40240b668ccd94ebecb5ce8098f0d48de13cdcb6dde3842be2eba57ae8a5b742fe +AUX gnome-control-center-3.14.0-optional.patch 19466 SHA256 154aff2082e4c9009e4bda1a54fa479430cfde08c91e446b64517cfe7a2b28d9 SHA512 e59082f637573a339aeb931423e55e971118c3b1ed05474d315c86843d0766f0339e33c4461e6b2e6e8bd167de6dc0705cf37aa44ea886fed3fa9d174678ff17 WHIRLPOOL 92603d135e486694c6a4b4af735e6498c14259c5b1e5add1b0a944f4809a2da2d8aa0edece113e683aa52e276ca9951c585c285d1033d9730a7eb8b87020d689 DIST gnome-control-center-3.12.1.tar.xz 6866544 SHA256 5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582 SHA512 35b765fc11182b0f7eec6bc31934f51ccbf01dde9f2e7deed6c84ca9811bd0a00783d75bd3fab7004fe41cc29740b6d6e0a7f3c6391a482eefcab0129d0278fe WHIRLPOOL 294a2f81a1b225814fd895dc7b579f0dec9c360983d3d683b4ff5bd47dd9ac91a84088485f872a7ef95e05f021469da9eaf5d987bd537a062f9a1525c03c4b47 +DIST gnome-control-center-3.14.2.tar.xz 6938572 SHA256 b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a SHA512 c5bcdcae87f32cf4b0f9d99709dfe7fcb48e5086945d1685ce94c3996022ff5bf4c82994bbec28e0cf91c9c85309638225536e1dcca06b96cdbaf1ff38f2ae6b WHIRLPOOL 3188ff540a8a01a6479c529f4fe629d2b695b185f762291691a6aefd0f815af382afca2ed8c4ff56e4e5161b3cabe751d507625e4638856034982d2e408000a5 EBUILD gnome-control-center-3.12.1-r1.ebuild 5021 SHA256 382d52bbc8294eaac4bc9d2daf878c0720007a18b3712ff5be12b5ad90316bfd SHA512 c601e47473fd60af2da56529ee1b883e055ee398a4d08a9cc028671e00e0ceb5316cb17a486385f1e242efb8bf5e5623f487ff42c8b9119d30cc50687d4f40b3 WHIRLPOOL fa6236ecd93946911b6e3ecdcc1c0a42ac919bf058afca79beb557142c5f6317f9fdd470de486770960a74adf9c2318676577a4c99ff86bd5676b7077f52d196 -MISC ChangeLog 70220 SHA256 a84125849f9f20e1c99550c5f74454eb598d5f15f74c48967f9ba2b55739df41 SHA512 04ea2f59858b611896df126cdb09a1fda41237c08de6e6e99c964d8a1de321aa08281db4784ca7a59867677e004e3ffb7da81739ba91ab270ba5c1fa8581c6cb WHIRLPOOL 50647eb59d99d39a03246a7cd7b8985a51e4808eb80e1a2a84f461480784da5e7f659e99b107939bc1e1bc8a019c32a3a0c99bfe0080ab1405229796a668c619 +EBUILD gnome-control-center-3.14.2.ebuild 5004 SHA256 6dc5d4894eef7bf8abee2396fd243a7dd9c1ce55f7dceabdd5dbf5b249b7d879 SHA512 6497014c7c9c1e04ca62bb2296ea8faf30e11c4fedf6932f55067ff956c3333f6fd4cda76499ea848a2f556d28985a2edbedb52a7f968a5b7889ea64e38a2d6b WHIRLPOOL 38e12952cfa3887d7e912b8587b3fa1ee5f6cff08e887ae49e8b9fc2fa5b016007da21b32ef8ea4921089a789826ce5045684c576723f9457681caff8e78bec2 +MISC ChangeLog 70440 SHA256 4c66ef4d196b57f2c2e19382f5de4084a489f24d98c801f61fe4e77a09433faa SHA512 9051f814cb5d7e6416f2390defc277dc9d87071b407b187642137c6ed0b7369746806993ba3c491a57907e3e2a00c47ef1028446fb752f36175e8ebf52c40de0 WHIRLPOOL bf53e77ce954a9cbb47212e010ac40248b2bf465cbe5f68614d4b0f4830c5a3be608ce3d0e6c86e55e51e6e23dc0d84594ba0a15f2cd049e6d7eb1560936d2d8 MISC metadata.xml 498 SHA256 fb46c54dc3e3ce2c8297d67292cd0ecadbdadf8c22a50437f8a03fd5b6ec9dc2 SHA512 ae1ff3489b7d037af4d1a550538e0cadfa815f6afcaa76b73afb3fa7d87d888c1ae5b3642416e9eb0cf0c2ba4f70a5ed1f5a9ccbb1d63320fc444ac3c3aed2d3 WHIRLPOOL 94896b01f55c9a411cf85eda67cdebba03f2e32a723094f9f839e04c5096d09b63b4ac0895b7ddb70bc0ba3ef2ea4aeb6eba650e926fbaef155554a768fad970 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEAREIAAYFAlSYjocACgkQ1fmVwcYIWAZTtACglYuz+3MSXjwjLtHdxrIkWMb9 +42sAnRII79QJjJAdIlz2doW9m+dQGiuH +=FM5E +-----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch new file mode 100644 index 000000000000..a16165882e34 --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch @@ -0,0 +1,537 @@ +From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Fri, 25 Apr 2014 22:17:24 +0200 +Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional + +Upstream is not interested in any part of this patch: + +https://bugzilla.gnome.org/show_bug.cgi?id=686840 +https://bugzilla.gnome.org/show_bug.cgi?id=697478 +https://bugzilla.gnome.org/show_bug.cgi?id=700145 + +Dropped mm from this revision of the patch since it appears more +complicated than ever to split it from the network panel. + +Signed-Off: Gilles Dartiguelongue <eva@gentoo.org> +--- + configure.ac | 157 ++++++++++++++++++++++++++------ + panels/Makefile.am | 10 +- + panels/background/Makefile.am | 8 +- + panels/background/bg-pictures-source.c | 20 ++++ + panels/user-accounts/um-realm-manager.c | 9 ++ + shell/Makefile.am | 10 +- + shell/cc-panel-loader.c | 8 ++ + 7 files changed, 186 insertions(+), 36 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fe723d5..f882e23 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static]) + PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) + PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) + PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) +-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 +- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION +- goa-1.0 >= $GOA_REQUIRED_VERSION +- grilo-0.2 >= $GRILO_REQUIRED_VERSION) + PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION +@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) + PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) + PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) +-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) ++ ++build_online_accounts=false ++background_online_accounts= ++AC_ARG_ENABLE(goa, ++ AC_HELP_STRING([--disable-goa], ++ [disable online accounts management panel]), ++ [case "${enableval}" in ++ yes) WANT_ONLINE_ACCOUNTS=yes ;; ++ no) WANT_ONLINE_ACCOUNTS=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; ++ esac], ++ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value ++ ++if test x$WANT_ONLINE_ACCOUNTS = xyes; then ++ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) ++ build_online_accounts=true ++ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION" ++fi ++if test "x$build_online_accounts" = xtrue ; then ++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) ++fi ++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") ++AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) ++AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) ++ ++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0 ++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION ++ $background_online_accounts) ++ + PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION) +-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES +- colord >= $COLORD_REQUIRED_VERSION +- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION +- libsoup-2.4 +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) ++ ++build_color=false ++AC_ARG_ENABLE(color, ++ AC_HELP_STRING([--disable-color], ++ [disable color management panel]), ++ [case "${enableval}" in ++ yes) WANT_COLOR=yes ;; ++ no) WANT_COLOR=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; ++ esac], ++ [WANT_COLOR=yes]) dnl Default value ++ ++if test x$WANT_COLOR = xyes; then ++ ++ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES ++ colord >= $COLORD_REQUIRED_VERSION ++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION ++ libsoup-2.4 ++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) ++ build_color=true ++fi ++if test "x$build_color" = xtrue ; then ++ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) ++fi ++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") ++AC_SUBST(COLOR_PANEL_CFLAGS) ++AC_SUBST(COLOR_PANEL_LIBS) ++ + PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) + PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) +@@ -206,8 +253,25 @@ fi + AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) + + # Check for gnome-bluetooth +-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1, +- [have_bluetooth=yes], have_bluetooth=no) ++have_bluetooth=no ++AC_ARG_ENABLE(bluetooth, ++ AC_HELP_STRING([--disable-bluetooth], ++ [disable bluetooth management panel]), ++ [case "${enableval}" in ++ yes) WANT_BLUETOOTH=yes ;; ++ no) WANT_BLUETOOTH=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; ++ esac], ++ [WANT_BLUETOOTH=yes]) dnl Default value ++ ++if test x$WANT_BLUETOOTH = xyes; then ++ # Check for gnome-bluetooth ++ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1, ++ [have_bluetooth=yes], have_bluetooth=no) ++ have_bluetooth=yes ++fi ++ ++ + if test "x$have_bluetooth" = xyes ; then + AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) + fi +@@ -292,15 +356,27 @@ case $host_os in + if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then + have_wacom=no + else +- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES +- gnome-settings-daemon >= $GSD_REQUIRED_VERSION +- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION +- clutter-gtk-1.0 +- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) +- have_wacom=yes +- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) +- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) ++ AC_ARG_ENABLE(wacom, ++ AC_HELP_STRING([--disable-wacom], ++ [disable wacom management panel]), ++ [case "${enableval}" in ++ yes) WANT_WACOM=yes ;; ++ no) WANT_WACOM=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; ++ esac], ++ [WANT_WACOM=yes]) dnl Default value ++ ++ if test x$WANT_WACOM = xyes; then ++ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES ++ gnome-settings-daemon >= $GSD_REQUIRED_VERSION ++ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION ++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION ++ clutter-gtk-1.0 ++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) ++ have_wacom=yes ++ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) ++ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) ++ fi + fi + ;; + *) +@@ -310,16 +386,22 @@ esac + AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) + + # 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]) +-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_ARG_ENABLE([kerberos], ++ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, ++ [enable_kerberos=yes]) ++ ++if test x"$enable_kerberos" != x"no" ; then ++ 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]) ++ 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_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) ++fi + AC_SUBST(KRB5_CFLAGS) + AC_SUBST(KRB5_LIBS) + +@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then + else + AC_MSG_NOTICE([ Bluetooth panel disabled]) + fi ++if test "x$build_color" = "xtrue"; then ++ AC_MSG_NOTICE([** colord (Color panel)]) ++else ++ AC_MSG_NOTICE([ Color panel disabled]) ++fi + if test "x$enable_cups" = "xyes"; then + AC_MSG_NOTICE([** CUPS (Printers panel)]) + else +@@ -548,6 +635,16 @@ if test "x$have_cheese" = "xyes"; then + else + AC_MSG_NOTICE([ Users panel webcam support disabled]) + fi ++if test "x$build_online_accounts" = "xtrue"; then ++ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) ++else ++ AC_MSG_NOTICE([ Online Accounts panel disabled]) ++fi ++if test "x$build_wacom" = "xtrue"; then ++ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) ++else ++ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) ++fi + if test "x$have_wacom" = "xyes"; then + AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) + else +diff --git a/panels/Makefile.am b/panels/Makefile.am +index 9961c25..0c54622 100644 +--- a/panels/Makefile.am ++++ b/panels/Makefile.am +@@ -2,11 +2,9 @@ SUBDIRS= \ + common \ + background \ + power \ +- color \ + display \ + mouse \ + notifications \ +- online-accounts \ + region \ + info \ + sound \ +@@ -18,6 +16,10 @@ SUBDIRS= \ + privacy \ + sharing + ++if BUILD_COLOR ++SUBDIRS += color ++endif ++ + if BUILD_WACOM + SUBDIRS += wacom + endif +@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH + SUBDIRS += bluetooth + endif + ++if BUILD_ONLINE_ACCOUNTS ++SUBDIRS += online-accounts ++endif ++ + -include $(top_srcdir)/git.mk +diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am +index ccb8017..bde4cdf 100644 +--- a/panels/background/Makefile.am ++++ b/panels/background/Makefile.am +@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \ + $(BUILT_SOURCES) \ + cc-background-chooser-dialog.c \ + cc-background-chooser-dialog.h \ +- cc-background-grilo-miner.c \ +- cc-background-grilo-miner.h \ + cc-background-item.c \ + cc-background-item.h \ + cc-background-xml.c \ +@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \ + bg-colors-source.c \ + bg-colors-source.h + ++if BUILD_ONLINE_ACCOUNTS ++libbackground_chooser_la_SOURCES += \ ++ cc-background-grilo-miner.c \ ++ cc-background-grilo-miner.h ++endif ++ + libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) + + libbackground_la_SOURCES = \ +diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c +index c165fa3..78ef4a5 100644 +--- a/panels/background/bg-pictures-source.c ++++ b/panels/background/bg-pictures-source.c +@@ -23,13 +23,17 @@ + + #include "bg-pictures-source.h" + ++#ifdef BUILD_ONLINE_ACCOUNTS + #include "cc-background-grilo-miner.h" ++#endif + #include "cc-background-item.h" + + #include <string.h> + #include <cairo-gobject.h> + #include <gio/gio.h> ++#ifdef BUILD_ONLINE_ACCOUNTS + #include <grilo.h> ++#endif + #include <libgnome-desktop/gnome-desktop-thumbnail.h> + #include <gdesktop-enums.h> + +@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate + { + GCancellable *cancellable; + ++#ifdef BUILD_ONLINE_ACCOUNTS + CcBackgroundGriloMiner *grl_miner; ++#endif + + GnomeDesktopThumbnailFactory *thumb_factory; + +@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object) + g_clear_object (&priv->cancellable); + } + ++#ifdef BUILD_ONLINE_ACCOUNTS + g_clear_object (&priv->grl_miner); ++#endif + g_clear_object (&priv->thumb_factory); + + G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); +@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source, + gboolean needs_download; + gboolean retval = FALSE; + GFile *pictures_dir, *cache_dir; ++#ifdef BUILD_ONLINE_ACCOUNTS + GrlMedia *media; ++#else ++ gpointer media = NULL; ++#endif + + /* find png and jpeg files */ + if (!content_type) +@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source, + + read_file: + ++#ifdef BUILD_ONLINE_ACCOUNTS + media = g_object_get_data (G_OBJECT (file), "grl-media"); ++#endif + if (media == NULL) + { + g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); +@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, + return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); + } + ++#ifdef BUILD_ONLINE_ACCOUNTS + static gboolean + add_single_file_from_media (BgPicturesSource *bg_source, + GFile *file, +@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, + + return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); + } ++#endif /* BUILD_ONLINE_ACCOUNTS */ + + gboolean + bg_pictures_source_add (BgPicturesSource *bg_source, +@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor *monitor, + } + } + ++#ifdef BUILD_ONLINE_ACCOUNTS + static void + media_found_cb (BgPicturesSource *self, GrlMedia *media) + { +@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) + g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); + add_single_file_from_media (self, file, media); + } ++#endif /* BUILD_ONLINE_ACCOUNTS */ + + static void + bg_pictures_source_init (BgPicturesSource *self) +@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self) + + g_object_unref (dir); + ++#ifdef BUILD_ONLINE_ACCOUNTS + priv->grl_miner = cc_background_grilo_miner_new (); + g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); + cc_background_grilo_miner_start (priv->grl_miner); ++#endif /* BUILD_ONLINE_ACCOUNTS */ + + priv->thumb_factory = + gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); +diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c +index 0849160..58d50a6 100644 +--- a/panels/user-accounts/um-realm-manager.c ++++ b/panels/user-accounts/um-realm-manager.c +@@ -22,7 +22,9 @@ + + #include "um-realm-manager.h" + ++#ifdef HAVE_KERBEROS + #include <krb5/krb5.h> ++#endif + + #include <glib.h> + #include <glib/gi18n.h> +@@ -696,6 +698,7 @@ login_closure_free (gpointer data) + g_slice_free (LoginClosure, login); + } + ++#ifdef HAVE_KERBEROS + static krb5_error_code + login_perform_kinit (krb5_context k5, + const gchar *realm, +@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5, + + return code; + } ++#endif /* HAVE_KERBEROS */ + + static void + kinit_thread_func (GSimpleAsyncResult *async, + GObject *object, + GCancellable *cancellable) + { ++#ifdef HAVE_KERBEROS + LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); + krb5_context k5 = NULL; + krb5_error_code code; +@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async, + + if (k5) + krb5_free_context (k5); ++#else /* HAVE_KERBEROS */ ++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, ++ _("gnome-control-center was built without kerberos support")); ++#endif + } + + void +diff --git a/shell/Makefile.am b/shell/Makefile.am +index c0cb91a..0b820fd 100644 +--- a/shell/Makefile.am ++++ b/shell/Makefile.am +@@ -55,14 +55,12 @@ gnome_control_center_LDADD = \ + $(top_builddir)/libgd/libgd.la \ + $(top_builddir)/panels/common/liblanguage.la \ + $(top_builddir)/panels/background/libbackground.la \ +- $(top_builddir)/panels/color/libcolor.la \ + $(top_builddir)/panels/datetime/libdate_time.la \ + $(top_builddir)/panels/display/libdisplay.la \ + $(top_builddir)/panels/info/libinfo.la \ + $(top_builddir)/panels/keyboard/libkeyboard.la \ + $(top_builddir)/panels/mouse/libmouse-properties.la \ + $(top_builddir)/panels/notifications/libnotifications.la \ +- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ + $(top_builddir)/panels/power/libpower.la \ + $(top_builddir)/panels/privacy/libprivacy.la \ + $(top_builddir)/panels/region/libregion.la \ +@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH + gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la + endif + ++if BUILD_COLOR ++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la ++endif ++ ++if BUILD_ONLINE_ACCOUNTS ++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la ++endif ++ + # Dbus service file + servicefiledir = $(datadir)/dbus-1/services + servicefile_in_files = org.gnome.ControlCenter.service.in +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index 26576dc..8a92f95 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); + #ifdef BUILD_BLUETOOTH + extern GType cc_bluetooth_panel_get_type (void); + #endif /* BUILD_BLUETOOTH */ ++#ifdef BUILD_COLOR + extern GType cc_color_panel_get_type (void); ++#endif /* BUILD_COLOR */ + extern GType cc_date_time_panel_get_type (void); + extern GType cc_display_panel_get_type (void); + extern GType cc_info_panel_get_type (void); +@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); + extern GType cc_network_panel_get_type (void); + #endif /* BUILD_NETWORK */ + extern GType cc_notifications_panel_get_type (void); ++#ifdef BUILD_ONLINE_ACCOUNTS + extern GType cc_goa_panel_get_type (void); ++#endif /* BUILD_ONLINE_ACCOUNTS */ + extern GType cc_power_panel_get_type (void); + #ifdef BUILD_PRINTERS + extern GType cc_printers_panel_get_type (void); +@@ -77,7 +81,9 @@ static struct { + #ifdef BUILD_BLUETOOTH + PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), + #endif ++#ifdef BUILD_COLOR + PANEL_TYPE("color", cc_color_panel_get_type ), ++#endif + PANEL_TYPE("datetime", cc_date_time_panel_get_type ), + PANEL_TYPE("display", cc_display_panel_get_type ), + PANEL_TYPE("info", cc_info_panel_get_type ), +@@ -87,7 +93,9 @@ static struct { + PANEL_TYPE("network", cc_network_panel_get_type ), + #endif + PANEL_TYPE("notifications", cc_notifications_panel_get_type), ++#ifdef BUILD_ONLINE_ACCOUNTS + PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), ++#endif + PANEL_TYPE("power", cc_power_panel_get_type ), + #ifdef BUILD_PRINTERS + PANEL_TYPE("printers", cc_printers_panel_get_type ), +-- +2.1.2 + diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild new file mode 100644 index 000000000000..b7139ead9608 --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild,v 1.1 2014/12/22 21:35:02 eva Exp $ + +EAPI="5" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen + +inherit autotools bash-completion-r1 eutils gnome2 + +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" +HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" + +LICENSE="GPL-2+" +SLOT="2" +IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" + +# False positives caused by nested configure scripts +QA_CONFIGURE_OPTIONS=".*" + +# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login +# g-s-d[policykit] needed for bug #403527 +# +# kerberos unfortunately means mit-krb5; build fails with heimdal + +# FIXME: modemmanager is not optional +# networkmanager is not optional + +COMMON_DEPEND=" + >=dev-libs/glib-2.39.91:2 + >=x11-libs/gdk-pixbuf-2.23.0:2 + >=x11-libs/gtk+-3.13:3 + >=gnome-base/gsettings-desktop-schemas-3.13.91 + >=gnome-base/gnome-desktop-3.11.3:3= + >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit] + + >=dev-libs/libpwquality-1.2.2 + dev-libs/libxml2:2 + gnome-base/libgtop:2= + media-libs/fontconfig + + >=media-libs/libcanberra-0.13[gtk3] + >=media-sound/pulseaudio-2[glib] + >=sys-auth/polkit-0.97 + >=sys-power/upower-0.99:= + >=x11-libs/libnotify-0.7.3:0= + + >=gnome-extra/nm-applet-0.9.7.995 + >=net-misc/networkmanager-0.9.8[modemmanager] + >=net-misc/modemmanager-0.7.990 + + virtual/opengl + x11-apps/xmodmap + x11-libs/cairo + x11-libs/libX11 + x11-libs/libXxf86misc + >=x11-libs/libXi-1.2 + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= ) + colord? ( + net-libs/libsoup:2.4 + >=x11-misc/colord-0.1.34:0= + >=x11-libs/colord-gtk-0.1.24 ) + cups? ( + >=net-print/cups-1.4[dbus] + || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) + gnome-online-accounts? ( + >=media-libs/grilo-0.2.6:0.2 + >=net-libs/gnome-online-accounts-3.9.90 ) + i18n? ( >=app-i18n/ibus-1.5.2 ) + kerberos? ( app-crypt/mit-krb5 ) + v4l? ( + media-libs/gstreamer:1.0 + media-libs/clutter-gtk:1.0 + >=media-video/cheese-3.5.91 ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + >=media-libs/clutter-1.11.3:1.0 + media-libs/clutter-gtk:1.0 + >=x11-libs/libXi-1.2 ) +" +# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x +# libgnomekbd needed only for gkbd-keyboard-display tool +RDEPEND="${COMMON_DEPEND} + || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 ) + >=sys-apps/accountsservice-0.6.30 + x11-themes/gnome-icon-theme-symbolic + colord? ( >=gnome-extra/gnome-color-manager-3 ) + cups? ( + >=app-admin/system-config-printer-gnome-1.3.5 + net-print/cups-pk-helper ) + input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) + i18n? ( >=gnome-base/libgnomekbd-3 ) + + !<gnome-base/gdm-2.91.94 + !<gnome-extra/gnome-color-manager-3.1.2 + !gnome-extra/gnome-media[pulseaudio] + !<gnome-extra/gnome-media-2.32.0-r300 + !<net-wireless/gnome-bluetooth-3.3.2 +" +# PDEPEND to avoid circular dependency +PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" + +DEPEND="${COMMON_DEPEND} + x11-proto/xproto + x11-proto/xf86miscproto + x11-proto/kbproto + + dev-libs/libxml2:2 + dev-libs/libxslt + >=dev-util/intltool-0.40.1 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + + cups? ( sys-apps/sed ) + + gnome-base/gnome-common +" +# Needed for autoreconf +# gnome-base/gnome-common + +src_prepare() { + # Gentoo handles completions in a different directory, bugs #465094 and #477390 + sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \ + shell/Makefile.am || die "sed completiondir failed" + + # Make some panels and dependencies optional; requires eautoreconf + # https://bugzilla.gnome.org/686840, 697478, 700145 + epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch + + # Fix some absolute paths to be appropriate for Gentoo + epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch + + epatch_user + + eautoreconf + + # panels/datetime/Makefile.am gets touched by "gentoo-paths" patch. + # We need to touch timedated{c,h} to prevent them from being + # regenerated (bug #415901) + # Upstream think they should be removed, preventing compilation errors too + # (https://bugzilla.gnome.org/704822) + [[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h + [[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c + + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --disable-update-mimedb \ + --disable-static \ + --enable-documentation \ + $(use_enable bluetooth) \ + $(use_enable colord color) \ + $(use_enable cups) \ + $(use_enable gnome-online-accounts goa) \ + $(use_enable i18n ibus) \ + $(use_enable kerberos) \ + $(use_with v4l cheese) \ + $(use_enable input_devices_wacom wacom) +} diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index 8a5c68e6a112..dae9cba15485 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gvfs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.273 2014/12/19 13:37:37 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.274 2014/12/22 21:34:12 eva Exp $ + +*gvfs-1.22.2 (22 Dec 2014) + + 22 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-1.22.2.ebuild: + Version bump for Gnome 3.14. 19 Dec 2014; Pacho Ramos <pacho@gentoo.org> gvfs-1.20.3.ebuild: amd64 stable, bug 529964 diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index b9122f178eab..ad86763acb03 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -3,14 +3,16 @@ Hash: SHA256 DIST gvfs-1.20.2.tar.xz 1560752 SHA256 84d9412e7bedfba902696ae7fb0cfceb0b66b98823f8388745b20693e3b24f8e SHA512 44ab907d4776e75c5b1a637e14fa0a794257fddedcbd73ec70ef1f1457a2beac49640f8396e2fca3f828dd48a91c656e0623003c6455520bf69ba604376fc089 WHIRLPOOL fe4e9c125a0f53f3a4de9b731fe592bf8f4b159bd250f53bec7cfa34115e2350a02770ad9535716c7234cc9934e98438308b25b55069fa63d172f226666ae64d DIST gvfs-1.20.3.tar.xz 1558028 SHA256 646b1906b1c85876fa07299246855f16836080466dde1826003bbbd4b9415cba SHA512 3a975b2014d7d82ec76062624343df4514d46a537cdcb3daf1cee2f77b7e0e06db123d3fb0de44987dc147c4023d2cfa9e46786378b1390d5957c16f4f14155e WHIRLPOOL 90285449626ffc284c798256f965188c3614efee6c1118bbaf1f8e178450e2bd8ddd9ec6d4f3e979ab6a789317848aae1afb3af9e3c3531af8865e99a90438f7 +DIST gvfs-1.22.2.tar.xz 1585720 SHA256 8d08c4927b6c20d990498c23280017e7033b31a386f09b4c3ce5bedd20316250 SHA512 aed00c84f5ee58ce8427f943b6097f7371d00ce36ec858a43b361b5b49161d0f0102d66edd8482416d5121eef43ad298ff55b5a3810bbb45a576e06ff004521f WHIRLPOOL e956ca886e78946396a4c477d21597b556f717822e5209d29bc5cbbc9478e39d3c26cd143af0590d4f3bf82a9acabb6b8b66ecd63204a3ab5d1a6c68d4f3639d EBUILD gvfs-1.20.2.ebuild 3477 SHA256 fd0ac1d2137f09d709cb0216c27067432cb0f134403b27beeffecbee07232d06 SHA512 1938e634d1aab210bbac3fd7652b529f87f92a0751176dea437e0a0344aa373c742bd5ae0d534bb6bd6f85c3af65ca12dd50b4c3ad32f8f2c7136e45e7c930d7 WHIRLPOOL d1a85a76ca28940a513a1f052d1219ee6c236e31e67f06637d82099b92be0f08fbdcd3f0488171e531b0a54070c332e4c8b9127f823be7b33c53d4593a7a9504 EBUILD gvfs-1.20.3.ebuild 3472 SHA256 c8723df47694f2c0476eb611f356e107be78f7be87c179ce04e5cdbb937f53ec SHA512 17185f62b29fd68784eb42fc80bc7a823aa095a0fe00d58b230053a835dfdc2c3a6f1220100b0cb460d59104c7d8b2746aa5134363f389e4559b6e877bd179d7 WHIRLPOOL c5bb2827af54e8007a12754c2889ed92d2b3fffb234af72453df654e9d67c188c6f64384d732670279622202348deaa870aaebc5de4dad63a06a69b315c85bc4 -MISC ChangeLog 38538 SHA256 89f25b4fa68f904000be6cfbee1de3be2a5618b5b436797a77700a771b313c66 SHA512 3f56f9377215194ed3889ac501c101edd31ccc7305e778ded75ec3e04e45b8500420bd68ce9259d29ef12a6838e32606dc7c3762fc10388c8eae189421a17ccc WHIRLPOOL c4a9488cf2b72fa2e9ca9dae44fcb0571c67592647fced68e6978b5ff571485a78bcfadf31b3fe30e311c0ec61d84aeac2d05528c11bb5a3a72ddd1c6d0d4854 +EBUILD gvfs-1.22.2.ebuild 3472 SHA256 52c0885e720181994f9326814e44847efa3e5182ba9448566eec197872f9855d SHA512 e54a886e83a31b0e494cd2abf61908d6ce4046ed1bba32785acd1984737a12d51e38e9466d1fab9436a5b29e2296a26cea7f72c4090254dac1993107e7d875c9 WHIRLPOOL 0047e375dfe866e6de8c325ad0cc582f8491f528a5374f2942b83f4eca8cb501453b7764e25139b89a7611538ad607d8eb87a018b54f308530598127e4edc46c +MISC ChangeLog 38671 SHA256 dda923934fa68359d63346a3a3782cc045dcee3115c3a3236fd772d116d088a9 SHA512 012a6a12ced4383e6c10722cc14b395daa92336978f78e69aee8528fc8ae0cf5d844867a85483112e06b7bf69a91a059b5ce42e3b2f225f36f22ef59ab1534ef WHIRLPOOL 93c33756605cf4a0c920020e0b28d9a7e88564bc42373795b2686f2a0e5713af1f77c26fdee1073badb8b1e22215014971b2159bc06821cd0960b5956a972d80 MISC metadata.xml 1371 SHA256 0d15d1c36cf3b9ba1e35e4ecb16542410edf0b1c1c83f74d76a9ddc3da40abc8 SHA512 008e52b6d717f465bb275d72fc8076c8e65362dd9e769305205693cf42d2b2bdcab66abdf15dfab89bcc97b938d7ce5248048d60d1bad1915dbd32106b411b98 WHIRLPOOL 0be1ef0c90e36b97103dd3d6938f23f4334eda971b55137db157efa02d2bc0a25e6e4b920ca9bba544ce40cd1e08772374264a7b5805c740c296d35fb77b228f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSUKiMACgkQCaWpQKGI+9QIwACeMZRFwFoWXV3n4rdZ8w8er1cE -JJ4Ani5vybg0FIOD0Vo3n3tnPFTl4ptD -=0qI3 +iEYEAREIAAYFAlSYjlUACgkQ1fmVwcYIWAbw5gCg51YtjqAyBULsIShkfrtExUvB +96kAn0JrWCqFmHYTZ9jdRqQ7A/zEdnmF +=dX75 -----END PGP SIGNATURE----- diff --git a/gnome-base/gvfs/gvfs-1.22.2.ebuild b/gnome-base/gvfs/gvfs-1.22.2.ebuild new file mode 100644 index 000000000000..00579cd7e33c --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.22.2.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.22.2.ebuild,v 1.1 2014/12/22 21:34:12 eva Exp $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit autotools bash-completion-r1 eutils gnome2 + +DESCRIPTION="Virtual filesystem implementation for gio" +HOMEPAGE="https://git.gnome.org/browse/gvfs" + +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="afp archive avahi bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks" +REQUIRED_USE=" + cdda? ( udev ) + mtp? ( udev ) + udisks? ( udev ) + systemd? ( udisks ) +" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +# Can use libgphoto-2.5.0 as well. Automagic detection. +RDEPEND=" + >=dev-libs/glib-2.37:2 + sys-apps/dbus + dev-libs/libxml2:2 + net-misc/openssh + afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) + archive? ( app-arch/libarchive:= ) + avahi? ( >=net-dns/avahi-0.6 ) + bluray? ( media-libs/libbluray ) + fuse? ( >=sys-fs/fuse-2.8.0 ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) + gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) + gtk? ( >=x11-libs/gtk+-3.0:3 ) + http? ( >=net-libs/libsoup-2.42:2.4 ) + ios? ( + >=app-pda/libimobiledevice-1.1.5:= + >=app-pda/libplist-1:= ) + libsecret? ( app-crypt/libsecret ) + mtp? ( >=media-libs/libmtp-1.1.6 ) + samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) + systemd? ( sys-apps/systemd:0= ) + udev? ( + cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) + virtual/libgudev:= + virtual/libudev:= ) + udisks? ( >=sys-fs/udisks-1.97:2 ) +" +DEPEND="${RDEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=dev-util/intltool-0.40 + virtual/pkgconfig + dev-util/gdbus-codegen + dev-util/gtk-doc-am + test? ( + >=dev-python/twisted-core-12.3.0 + || ( + net-analyzer/netcat + net-analyzer/netcat6 ) ) + !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) +" +# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043 +# test dependencies needed per https://bugzilla.gnome.org/700162 + +# Tests with multiple failures, this is being handled upstream at: +# https://bugzilla.gnome.org/700162 +RESTRICT="test" + +src_prepare() { + DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits + + if ! use udev; then + sed -e 's/gvfsd-burn/ /' \ + -e 's/burn.mount.in/ /' \ + -e 's/burn.mount/ /' \ + -i daemon/Makefile.am || die + + eautoreconf + fi + + gnome2_src_prepare +} + +src_configure() { + # --enable-documentation installs man pages + # --disable-obexftp, upstream bug #729945 + gnome2_src_configure \ + --enable-bash-completion \ + --with-bash-completion-dir="$(get_bashcompdir)" \ + --disable-gdu \ + --disable-hal \ + --disable-obexftp \ + --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \ + --enable-documentation \ + $(use_enable afp) \ + $(use_enable archive) \ + $(use_enable avahi) \ + $(use_enable bluray) \ + $(use_enable cdda) \ + $(use_enable fuse) \ + $(use_enable gnome-online-accounts goa) \ + $(use_enable gphoto2) \ + $(use_enable gtk) \ + $(use_enable ios afc) \ + $(use_enable mtp libmtp) \ + $(use_enable udev) \ + $(use_enable udev gudev) \ + $(use_enable http) \ + $(use_enable libsecret keyring) \ + $(use_enable samba) \ + $(use_enable systemd libsystemd-login) \ + $(use_enable udisks udisks2) +} diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index 530c17193f06..f33584ebecce 100644 --- a/gnome-base/nautilus/ChangeLog +++ b/gnome-base/nautilus/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/nautilus # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.423 2014/11/13 11:38:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.424 2014/12/22 21:36:54 eva Exp $ + +*nautilus-3.14.2 (22 Dec 2014) + + 22 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> +nautilus-3.14.2.ebuild: + Version bump for Gnome 3.14. 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -files/nautilus-2.32.2.1-gold-glib2.32.patch, -nautilus-2.32.2.1-r2.ebuild, diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index ab6eea1e36d0..1d050a249cdf 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -3,13 +3,15 @@ Hash: SHA256 AUX nautilus-3.5.91-delete.patch 1893 SHA256 3471db5c9f2caf4ae4877fe1c1e8a53bbf972aaacdf8cfbe091d8debd24f937a SHA512 807fb309cf217225396bfee5e60856245671a75058c95bd96dffe796e4c27c311aac603afba90c7660595611fe227de0951201e92e5e4da905b01c5ea3ca2460 WHIRLPOOL b6b8a1e69c4a4ec9ddfa437f611bea5711a41b8bc37c0f2701cc210063ec7eee93f92ccb9ca0b70ba5f7abc9fe128e44ad34582d077f4ebddce62e0222e9a025 DIST nautilus-3.12.2.tar.xz 4975580 SHA256 969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1 SHA512 59a80fef3cedff5393061aeead552eec80bbd920ae71b918bb21ca6fc59ba1c4e85c641885a12dde5208345b8659f9d4a6e1ddf865f4cb94afd5a3a339839c01 WHIRLPOOL cc9369b606ee4c6727aba89240a17ef007e26c1c5c6cc54a92cb83d098a51ac1424431462125ba56564cad9e26023c489ada96ff5e6037eaf49537b9e76e49fe +DIST nautilus-3.14.2.tar.xz 3344428 SHA256 b2c9e13ba896a15101abf5d5fe30e291243e6030e0c84e8eb5df1e7bd90c10a5 SHA512 9d07878fc2474c7444fb7c573ce1886514b82ecb386365e608de81473184791daf17875b7ea471a7bef2c84df0d6d06b207223c7b5ec64d195e46865440ceff6 WHIRLPOOL c29af2fe684abeeffe58d6ba872b97b846db5d97cace8b73196fb77a024262f82df1908bac975b67938db9a12091dee681f1d827a551eb2610d11a6db2164495 EBUILD nautilus-3.12.2.ebuild 3477 SHA256 c80a355b6bc5059699197a92076640be6c5d2cd9943cd26a94eab0bfdf9da797 SHA512 415783085f92a11e52c15dfd5c83d40402aded97a50a50dc96755787ee38a580beb69c63761ce46b505e702a3250b960838b63ea7e1698b1dc1161ebc950acef WHIRLPOOL 1d2b3524a9d1c74b2d1d2e69f624684d6a236ed7861f335b67c6f5d32acd4b642d1dc8557eb56dd2f323d8678fec5491a4626038c1a2b52bf2d3c269fc2e9fdb -MISC ChangeLog 63854 SHA256 699fa09b70e4446fe899914b1c08d9b558fd4049798ba0f9e2d36ee66b705ba9 SHA512 49c79bc164cff2b5f9c0c33ee0ccee6fc3f8c996c08a79e43f951a0dffbb5b59faac81ceb55e08e4fc1bbf8a8f5eeac4ab00bfeb7cb9431d09b54eb36698194f WHIRLPOOL 9fddc71bf3631af25d1ff2386a27a88f0097d062d820b95f85115ee92685cf32b6e5cd8dd4e4b3715d9ab688cfeef14725dd70d976ddf7304d8c5814b3acba2b +EBUILD nautilus-3.14.2.ebuild 3479 SHA256 e56f2b69ac6f9bbc0f4709783c451b8ea409e72acfa6dbfae0d5f25f61851839 SHA512 d6938196ef580344e2e2b3440f8a9c0f4719cfac542f0dbab5abd105d1ca925f61bd7068e613823b0cc2fc8f14210da60004bdd35233a8839b7bdc9f56696bd1 WHIRLPOOL 87da8dae7e87609def41389f2131927e23841eb9897eabc28b9fc8905ac3d7967c738e0b25f292b65191852d5dd6a07ddad71adf52505ae7ef01afe0a966a5dd +MISC ChangeLog 63995 SHA256 fb9f847b6c9248db59b4888f6a71eac8e0a2896ca14fb56a32dfb94ba58504ef SHA512 ca6bd5f01a5052a9dddb256eac8c6451045fbaf97c71ed0863666e194f20e33a240d1c1a6d0cc7118db360761598ca4f7d7b85bb13ec599630bf81786149ea2c WHIRLPOOL dfe2aceb013d22d431c956ca41a7f83fd492a3d614e108239641f3a34186fd0edcb85749ba2801c27659de25632516c75cd04e4768b812d67869202ea7e19289 MISC metadata.xml 566 SHA256 c278ed8fe54c80b07d7b2495826346538a7daaeea11dd9bdeff87ec0a30e74a1 SHA512 daefe3974dae1d708f909a2207f2d09128ab045f8aee11c823093da779e3f283c59459a0f4962631b1508dc545b6ab448c1ead519839011ddeb619f4017f802a WHIRLPOOL b662f3823904bc970b1a8bcd4ca863a7726eb89c76ef4c1d6954ba4b720f4d7490b4cfcf1d30b683a8ecf562d74977598db7b976ec4eea943e86aa07c4dde28b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlRkmD0ACgkQCaWpQKGI+9QAzwCfbzPIj0306Ct71txtiaDnYBib -g9oAn00f0PuaL7ZPVxWLQ+I7LWI7efYr -=RuUi +iEYEAREIAAYFAlSYjvcACgkQ1fmVwcYIWAZcFQCfRLgo7ym6XNBvrv/kfTVBYcGr +7HsAn3hbcRhi1a5kwNNq1/ma0cm2jeAH +=m38o -----END PGP SIGNATURE----- diff --git a/gnome-base/nautilus/nautilus-3.14.2.ebuild b/gnome-base/nautilus/nautilus-3.14.2.ebuild new file mode 100644 index 000000000000..fb8863962d0e --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.14.2.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.14.2.ebuild,v 1.1 2014/12/22 21:36:54 eva Exp $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' + +inherit eutils gnome2 readme.gentoo virtualx + +DESCRIPTION="A file manager for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" + +LICENSE="GPL-2+ LGPL-2+ FDL-1.1" +SLOT="0" + +# profiling? +IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" + +# FIXME: tests fails under Xvfb, but pass when building manually +# "FAIL: check failed in nautilus-file.c, line 8307" +RESTRICT="test" + +# FIXME: selinux support is automagic +# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 +# and 2.30.0 +COMMON_DEPEND=" + >=dev-libs/glib-2.35.3:2 + >=x11-libs/pango-1.28.3 + >=x11-libs/gtk+-3.13.2:3[introspection?] + >=dev-libs/libxml2-2.7.8:2 + >=gnome-base/gnome-desktop-3:3= + + gnome-base/dconf + >=gnome-base/gsettings-desktop-schemas-3.8.0 + >=x11-libs/libnotify-0.7:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + + exif? ( >=media-libs/libexif-0.6.20 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) + tracker? ( >=app-misc/tracker-0.16:= ) + xmp? ( >=media-libs/exempi-2.1.0 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5 + >=dev-util/gdbus-codegen-2.33 + >=dev-util/gtk-doc-am-1.4 + >=dev-util/intltool-0.40.1 + sys-devel/gettext + virtual/pkgconfig + x11-proto/xproto +" +RDEPEND="${COMMON_DEPEND} + packagekit? ( app-admin/packagekit-base ) + sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) +" + +# For eautoreconf +# gnome-base/gnome-common +# dev-util/gtk-doc-am" + +PDEPEND=" + gnome? ( + >=x11-themes/gnome-icon-theme-1.1.91 + x11-themes/gnome-icon-theme-symbolic ) + tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) + previewer? ( >=gnome-extra/sushi-0.1.9 ) + sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) + >=gnome-base/gvfs-1.14[gtk] +" +# Need gvfs[gtk] for recent:/// support + +src_prepare() { + if use previewer; then + DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. + To activate the previewer, select a file and press space; to + close the previewer, press space again." + fi + + # Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work); + # bug #393663 + epatch "${FILESDIR}/${PN}-3.5.91-delete.patch" + + # Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822) + sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \ + -i configure || die "sed failed" + gnome2_src_prepare +} + +src_configure() { + DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS" + gnome2_src_configure \ + --disable-profiling \ + --disable-update-mimedb \ + $(use_enable debug) \ + $(use_enable exif libexif) \ + $(use_enable introspection) \ + $(use_enable packagekit) \ + $(use_enable sendto nst-extension) \ + $(use_enable tracker) \ + $(use_enable xmp) +} + +src_test() { + gnome2_environment_reset + unset DBUS_SESSION_BUS_ADDRESS + export GSETTINGS_BACKEND="memory" + Xemake check + unset GSETTINGS_BACKEND +} + +src_install() { + use previewer && readme.gentoo_create_doc + gnome2_src_install +} + +pkg_postinst() { + gnome2_pkg_postinst + + if use previewer; then + readme.gentoo_print_elog + else + elog "To preview media files, emerge nautilus with USE=previewer" + fi +} |