pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/gnome-desktop3 Update gnome-desktop3 to 3.14.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/57ab0e674eec
branches: trunk
changeset: 641458:57ab0e674eec
user: prlw1 <prlw1%pkgsrc.org@localhost>
date: Sat Nov 08 23:15:06 2014 +0000
description:
Update gnome-desktop3 to 3.14.1
- Fixed the build on systems lacking openat()
- Translation updates
- gnome-xkb-info: Fix some layouts not being associated to a locale
- gnome-rr: Add missing introspection annotations
- wall-clock: Add ref-tests for clock output
- wall-clock: Always use the ratio character (#726232)
- gnome-rr: Output the EDID vendor/product info as well
- gnome-rr: Add backlight output in debug
- thumbnailer: Try harder to create a failed thumbnail (#728775)
- Fix the build on OpenBSD
- gnome-rr: Improve debug output
- gnome-rr: Actually define output_get_possible_crtcs (#727034)
- gnome-rr: Initialize GnomeRROutputInfo:rotation to GNOME_RR_ROTATION_0 (#727023)
- Always set the DPMS mode when requested
- gnome-xkb-info: Remove xkbfile dependency (#719942) - API and ABI break
- gnome-xkb-info: Apply main layout locale metadata to variants (#711291)
- wall-clock: Replace ratio with colon on non-UTF-8 locales (#722664)
- more new gnome-rr api
- drop using glibc internal headers
- docs for thumbnailers
- idle monitor fixes
- use newer libgsystem internally
- gnome-rr: Improve debug output
- Add gnome_rr_output_get_min_backlight_step() API
diffstat:
x11/gnome-desktop3/Makefile | 8 +-
x11/gnome-desktop3/PLIST | 3 +-
x11/gnome-desktop3/buildlink3.mk | 4 +-
x11/gnome-desktop3/distinfo | 16 +-
x11/gnome-desktop3/patches/patch-aa | 33 +-
x11/gnome-desktop3/patches/patch-configure | 566 ----------
x11/gnome-desktop3/patches/patch-libgnome-desktop_Makefile.in | 274 ----
x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-file-utils.c | 16 +-
x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-shutil.c | 14 +-
9 files changed, 28 insertions(+), 906 deletions(-)
diffs (truncated from 1034 to 300 lines):
diff -r e9fc8d014c9e -r 57ab0e674eec x11/gnome-desktop3/Makefile
--- a/x11/gnome-desktop3/Makefile Sat Nov 08 21:59:33 2014 +0000
+++ b/x11/gnome-desktop3/Makefile Sat Nov 08 23:15:06 2014 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2014/09/21 04:43:51 prlw1 Exp $
+# $NetBSD: Makefile,v 1.20 2014/11/08 23:15:06 prlw1 Exp $
-DISTNAME= gnome-desktop-3.10.2
+DISTNAME= gnome-desktop-3.14.1
PKGNAME= ${DISTNAME:S/desktop/desktop3/}
-PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
@@ -22,12 +21,11 @@
CONFIGURE_ARGS+= --with-gnome-distributor="The NetBSD Foundation"
CONFIGURE_ARGS+= --disable-date-in-gnome-version
CONFIGURE_ARGS+= --disable-desktop-docs
-CONFIGURE_ARGS+= --disable-scrollkeeper
CONFIGURE_ARGS+= --disable-gtk-doc
BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.35.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+= gsettings-desktop-schemas>=3.5.91
diff -r e9fc8d014c9e -r 57ab0e674eec x11/gnome-desktop3/PLIST
--- a/x11/gnome-desktop3/PLIST Sat Nov 08 21:59:33 2014 +0000
+++ b/x11/gnome-desktop3/PLIST Sat Nov 08 23:15:06 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/02/12 01:23:33 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/11/08 23:15:06 prlw1 Exp $
include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-crossfade.h
include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-slide-show.h
include/gnome-desktop-3.0/libgnome-desktop/gnome-bg.h
@@ -83,6 +83,7 @@
share/locale/fur/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/fy/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/ga/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/gd/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/gl/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/gu/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/ha/LC_MESSAGES/gnome-desktop-3.0.mo
diff -r e9fc8d014c9e -r 57ab0e674eec x11/gnome-desktop3/buildlink3.mk
--- a/x11/gnome-desktop3/buildlink3.mk Sat Nov 08 21:59:33 2014 +0000
+++ b/x11/gnome-desktop3/buildlink3.mk Sat Nov 08 23:15:06 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2014/05/05 00:48:28 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2014/11/08 23:15:06 prlw1 Exp $
BUILDLINK_TREE+= gnome-desktop3
@@ -6,7 +6,7 @@
GNOME_DESKTOP3_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-desktop3+= gnome-desktop3>=3.4.2
-BUILDLINK_ABI_DEPENDS.gnome-desktop3+= gnome-desktop3>=3.10.2nb1
+BUILDLINK_ABI_DEPENDS.gnome-desktop3+= gnome-desktop3>=3.14.0
BUILDLINK_PKGSRCDIR.gnome-desktop3?= ../../x11/gnome-desktop3
.include "../../x11/gtk3/buildlink3.mk"
diff -r e9fc8d014c9e -r 57ab0e674eec x11/gnome-desktop3/distinfo
--- a/x11/gnome-desktop3/distinfo Sat Nov 08 21:59:33 2014 +0000
+++ b/x11/gnome-desktop3/distinfo Sat Nov 08 23:15:06 2014 +0000
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.9 2014/09/25 15:10:21 prlw1 Exp $
+$NetBSD: distinfo,v 1.10 2014/11/08 23:15:06 prlw1 Exp $
-SHA1 (gnome-desktop-3.10.2.tar.xz) = fd13640ad7f096f29267366bcdf4cf8dc95af07a
-RMD160 (gnome-desktop-3.10.2.tar.xz) = 9d59c58c497eafa75a5ae7a38edaa740c8c77726
-Size (gnome-desktop-3.10.2.tar.xz) = 1062876 bytes
-SHA1 (patch-aa) = 26bd3513ac6757ab1a406a8c40be37aa25c98ad4
-SHA1 (patch-configure) = febb8117f7d3b658d813679f0a95d46661e02147
-SHA1 (patch-libgnome-desktop_Makefile.in) = c8ff8fe775102aed193652f5569779a561bc3897
-SHA1 (patch-libgnome-desktop_libgsystem_gsystem-file-utils.c) = a67d29c3a5693cdc305e7826159fe29a21d12c0b
-SHA1 (patch-libgnome-desktop_libgsystem_gsystem-shutil.c) = ae279d6a60909284226853589470dc2e2c8363a9
+SHA1 (gnome-desktop-3.14.1.tar.xz) = a5544c4dbebf7acf84ba295be1a0f360b1937c2b
+RMD160 (gnome-desktop-3.14.1.tar.xz) = 013e5fe4961d3c83c2ae90b7039cf16237f2770e
+Size (gnome-desktop-3.14.1.tar.xz) = 1122552 bytes
+SHA1 (patch-aa) = 1d22c87b74aa554e4d9561cb5dcf0a8eae6b9e54
+SHA1 (patch-libgnome-desktop_libgsystem_gsystem-file-utils.c) = 0a4ab3e08c777e17e8809afeb8950b3a900e0c1a
+SHA1 (patch-libgnome-desktop_libgsystem_gsystem-shutil.c) = 4d8f05dee8e32f6621a0063b2bee2b0fc2335e08
diff -r e9fc8d014c9e -r 57ab0e674eec x11/gnome-desktop3/patches/patch-aa
--- a/x11/gnome-desktop3/patches/patch-aa Sat Nov 08 21:59:33 2014 +0000
+++ b/x11/gnome-desktop3/patches/patch-aa Sat Nov 08 23:15:06 2014 +0000
@@ -1,40 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2014/09/21 04:43:51 prlw1 Exp $
-
-Fix build on systems which don't provide openat()
-https://bugzilla.gnome.org/show_bug.cgi?id=735974
+$NetBSD: patch-aa,v 1.5 2014/11/08 23:15:06 prlw1 Exp $
allow 64-bit time_t on 32-bit system
--- libgnome-desktop/gnome-desktop-thumbnail.c.orig 2013-11-21 11:14:44.000000000 +0000
+++ libgnome-desktop/gnome-desktop-thumbnail.c
-@@ -43,7 +43,9 @@
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include "gnome-desktop-thumbnail.h"
- #include <glib/gstdio.h>
-+#ifdef HAVE_OPENAT
- #include <libgsystem.h>
-+#endif
-
- #define SECONDS_BETWEEN_STATS 10
-
-@@ -376,14 +378,16 @@ _gdk_pixbuf_new_from_uri_at_scale (const
- }
-
- if (input_stream == NULL) {
-+#ifdef HAVE_OPENAT
- if (g_file_is_native (file))
- input_stream = gs_file_read_noatime (file, NULL, &error);
- else
-+#endif
- input_stream = G_INPUT_STREAM (g_file_read (file, NULL, &error));
- if (input_stream == NULL) {
- g_warning ("Unable to create an input stream for %s: %s", uri, error->message);
- g_clear_error (&error);
-- g_object_unref (file);
-+ g_object_unref (file);
- return NULL;
- }
- }
@@ -1666,7 +1670,7 @@ gnome_desktop_thumbnail_is_valid (GdkPix
thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
if (!thumb_mtime_str)
diff -r e9fc8d014c9e -r 57ab0e674eec x11/gnome-desktop3/patches/patch-configure
--- a/x11/gnome-desktop3/patches/patch-configure Sat Nov 08 21:59:33 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,566 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2014/09/21 04:43:51 prlw1 Exp $
-
-Fix build on systems which don't provide openat()
-https://bugzilla.gnome.org/show_bug.cgi?id=735974
-
---- configure.orig 2014-09-21 04:28:34.000000000 +0000
-+++ configure
-@@ -676,10 +676,6 @@ CATOBJEXT
- CATALOGS
- MSGFMT_OPTS
- GETTEXT_PACKAGE
--YELP_HELP_RULES
--XMLLINT
--ITSTOOL
--HELP_DIR
- ISO_CODES_PREFIX
- XKB_BASE
- GNOME_DESKTOP_LIBS
-@@ -692,6 +688,8 @@ X_CFLAGS
- XMKMF
- XLIB_LIBS
- XLIB_CFLAGS
-+USE_LIBGSYSTEM_FALSE
-+USE_LIBGSYSTEM_TRUE
- LIBM
- XEXT_REQUIRED
- XRANDR_REQUIRED
-@@ -891,7 +889,6 @@ enable_deprecation_flags
- enable_desktop_docs
- with_pnp_ids_path
- with_x
--with_help_dir
- enable_introspection
- with_html_dir
- enable_gtk_doc
-@@ -915,8 +912,6 @@ XLIB_LIBS
- XMKMF
- GNOME_DESKTOP_CFLAGS
- GNOME_DESKTOP_LIBS
--ITSTOOL
--XMLLINT
- GTKDOC_DEPS_CFLAGS
- GTKDOC_DEPS_LIBS'
-
-@@ -1581,7 +1576,6 @@ Optional Packages:
- --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor
- --with-pnp-ids-path Specify the path to pnp.ids [default=(internal)]
- --with-x use the X Window System
-- --with-help-dir=DIR path where help files are installed
- --with-html-dir=PATH path to installed docs
-
- Some influential environment variables:
-@@ -1605,8 +1599,6 @@ Some influential environment variables:
- C compiler flags for GNOME_DESKTOP, overriding pkg-config
- GNOME_DESKTOP_LIBS
- linker flags for GNOME_DESKTOP, overriding pkg-config
-- ITSTOOL Path to the `itstool` command
-- XMLLINT Path to the `xmllint` command
- GTKDOC_DEPS_CFLAGS
- C compiler flags for GTKDOC_DEPS, overriding pkg-config
- GTKDOC_DEPS_LIBS
-@@ -2397,7 +2389,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
--am__api_version='1.13'
-+am__api_version='1.14'
-
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-@@ -3079,6 +3071,47 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
-
-
-
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake%gnu.org@localhost about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-+ fi
-+fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
- $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-@@ -4176,6 +4209,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-+if ${am_cv_prog_cc_c_o+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ # Make sure it works both with $CC and with simple cc.
-+ # Following AC_PROG_CC_C_O, we do the test twice because some
-+ # compilers refuse to overwrite an existing .o file with -o,
-+ # though they will create one.
-+ am_cv_prog_cc_c_o=yes
-+ for am_i in 1 2; do
-+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } \
-+ && test -f conftest2.$ac_objext; then
-+ : OK
-+ else
-+ am_cv_prog_cc_c_o=no
-+ break
-+ fi
-+ done
-+ rm -f core conftest*
-+ unset am_i
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-+$as_echo "$am_cv_prog_cc_c_o" >&6; }
-+if test "$am_cv_prog_cc_c_o" != yes; then
Home |
Main Index |
Thread Index |
Old Index