[113234] trunk/dports/gnome/gnome-desktop
devans at macports.org
devans at macports.org
Tue Nov 12 22:30:28 PST 2013
Revision: 113234
https://trac.macports.org/changeset/113234
Author: devans at macports.org
Date: 2013-11-12 22:30:28 -0800 (Tue, 12 Nov 2013)
Log Message:
-----------
gnome-desktop: merge version 3.8.4 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/gnome-desktop/Portfile
Added Paths:
-----------
trunk/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff
trunk/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch
Property Changed:
----------------
trunk/dports/gnome/gnome-desktop/
Property changes on: trunk/dports/gnome/gnome-desktop
___________________________________________________________________
Added: svn:mergeinfo
+ /users/devans/GNOME-3/stable/dports/gnome/gnome-desktop:108269-113174
Modified: trunk/dports/gnome/gnome-desktop/Portfile
===================================================================
--- trunk/dports/gnome/gnome-desktop/Portfile 2013-11-13 06:29:58 UTC (rev 113233)
+++ trunk/dports/gnome/gnome-desktop/Portfile 2013-11-13 06:30:28 UTC (rev 113234)
@@ -4,51 +4,58 @@
PortSystem 1.0
name gnome-desktop
-version 2.32.1
-revision 4
+version 3.8.4
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories gnome
license LGPL-2+
platforms darwin
-description Additional UI API for GNOME 2
+description gnome-desktop contains the libgnome-desktop library, the gnome-about \
+ program as well as some desktop-wide documents.
long_description \
- This is a collection of APIs not included in \
- libgnomeui as they have not undergone sufficient \
- testing.
+ ${description} The libgnome-desktop library provides API shared \
+ by several applications on the desktop, but that cannot live \
+ in the platform for various reasons. Documentation for the API \
+ is available with gtk-doc.
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
-checksums md5 5c80d628a240eb9d9ff78913b31f2f67 \
- sha1 95767b6696ebc406b4349b383366b9aff32e39f4 \
- rmd160 c7f8ecea70d023cda1fff30253812b9ae5813f85
+use_xz yes
+checksums rmd160 8b4516892fea327eb51bb95ca217caf6c5728c58 \
+ sha256 2aa1d4c5b78b018368e1cf9cd3568555dd6b04ad68536b9f338b28ac0f89df9f
+
depends_build port:pkgconfig \
port:intltool \
port:gnome-common \
- port:gnome-doc-utils \
port:gtk-doc
depends_lib port:desktop-file-utils \
- port:gconf \
- port:startup-notification \
+ port:gsettings-desktop-schemas \
+ path:share/themes/HighContrast/index.theme:gnome-themes-standard \
+ port:gtk3 \
+ port:gobject-introspection \
+ port:iso-codes \
+ port:xorg-libXext \
port:xorg-libXrandr \
- port:rarian
+ port:xkeyboard-config \
+ port:xorg-libxkbfile
-depends_run path:share/themes/HighContrast/index.theme:gnome-themes
+patchfiles patch-gnome-desktop-Makefile.am.diff \
+ remove-intltool-perl-hack.patch
-patchfiles patch-libgnome-destop-gnome-bg.c.diff \
- patch-libgnome-destop-gnome-rr-config.c.diff
-
-configure.args --with-gnome-distributor=MacPorts \
+configure.args --enable-introspection=no \
+ --disable-maintainer-mode \
+ --disable-silent-rules \
+ --disable-desktop-docs \
+ --with-gnome-distributor=MacPorts \
--x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib \
- --disable-scrollkeeper
+ --x-libraries=${prefix}/lib
-# Don't do intltool's INTLTOOL_PERL dance
+# autoreconf with MacPorts patched intltool.m4
+
use_autoreconf yes
autoreconf.args -fvi
@@ -56,40 +63,8 @@
# portions of this port are strictly X11 specific
# so a +quartz build is not possible (fails in configure if X11 is absent)
#
-# handle +quartz by disabling X11 dependencies and exit with an error before configuration
-#
-variant quartz {
- depends_lib-delete port:startup-notification \
- port:xorg-libXrandr
- pre-configure {
- ui_error "${name} requires X11 development libraries to configure."
- ui_error "+quartz builds of ${name} are not allowed."
- return -code error "incompatible with +quartz build."
- }
-}
-
-variant python25 conflicts python26 python27 description {Use python 2.5} {
- configure.python ${prefix}/bin/python2.5
- depends_lib-append port:py25-pygtk
-}
-
-variant python26 conflicts python25 python27 description {Use python 2.6} {
- configure.python ${prefix}/bin/python2.6
- depends_lib-append port:py26-pygtk
-}
-
-variant python27 conflicts python25 python26 description {Use python 2.7} {
- configure.python ${prefix}/bin/python2.7
- depends_lib-append port:py27-pygtk
-}
-
-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python27
-}
-
post-activate {
- system "${prefix}/bin/scrollkeeper-update"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
Copied: trunk/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff)
===================================================================
--- trunk/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff (rev 0)
+++ trunk/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff 2013-11-13 06:30:28 UTC (rev 113234)
@@ -0,0 +1,12 @@
+--- libgnome-desktop/Makefile.am.orig 2013-07-20 15:19:18.000000000 -0700
++++ libgnome-desktop/Makefile.am 2013-07-20 15:19:51.000000000 -0700
+@@ -53,8 +53,7 @@
+ $(XLIB_LIBS) \
+ $(LIBM) \
+ $(GNOME_DESKTOP_LIBS) \
+- libgsystem.la \
+- -lrt
++ libgsystem.la
+
+ libgnome_desktop_3_la_LDFLAGS = \
+ -version-info $(LT_VERSION) \
Copied: trunk/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch)
===================================================================
--- trunk/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch (rev 0)
+++ trunk/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch 2013-11-13 06:30:28 UTC (rev 113234)
@@ -0,0 +1,30 @@
+--- m4/intltool.m4.orig 2013-07-02 11:22:23.000000000 -0700
++++ m4/intltool.m4 2013-07-02 11:22:32.000000000 -0700
+@@ -131,27 +131,6 @@ if test -z "$xgversion" -o -z "$mmversio
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+ fi
+
+-AC_PATH_PROG(INTLTOOL_PERL, perl)
+-if test -z "$INTLTOOL_PERL"; then
+- AC_MSG_ERROR([perl not found])
+-fi
+-AC_MSG_CHECKING([for perl >= 5.8.1])
+-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+-if test $? -ne 0; then
+- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+-else
+- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+- AC_MSG_RESULT([$IT_PERL_VERSION])
+-fi
+-if test "x$2" != "xno-xml"; then
+- AC_MSG_CHECKING([for XML::Parser])
+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- AC_MSG_RESULT([ok])
+- else
+- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+- fi
+-fi
+-
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131112/0aaa496e/attachment-0001.html>
More information about the macports-changes
mailing list