[135363] users/devans/GNOME-3/stable/dports/gnome/epiphany
devans at macports.org
devans at macports.org
Thu Apr 23 08:22:12 PDT 2015
Revision: 135363
https://trac.macports.org/changeset/135363
Author: devans at macports.org
Date: 2015-04-23 08:22:11 -0700 (Thu, 23 Apr 2015)
Log Message:
-----------
GNOME-3/stable: epiphany, reconfigure using upstream autogen.sh for intltool 0.51 compatibility, remove outdated file.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile
users/devans/GNOME-3/stable/dports/gnome/epiphany/files/patch-configure.ac.diff
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.12.1
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/epiphany/
Property changes on: users/devans/GNOME-3/stable/dports/gnome/epiphany
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/epiphany:108265-117652
/users/devans/GNOME-3/unstable/dports/gnome/epiphany:114069-118152
/users/rmstonecipher/gnome/epiphany:102363-103172
+ /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/epiphany:108265-134429
/users/devans/GNOME-3/unstable/dports/gnome/epiphany:114069-118152
/users/rmstonecipher/gnome/epiphany:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2015-04-23 15:22:09 UTC (rev 135362)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2015-04-23 15:22:11 UTC (rev 135363)
@@ -27,7 +27,10 @@
depends_build port:pkgconfig \
port:intltool \
- port:gnome-common
+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib port:desktop-file-utils \
port:gnome-icon-theme \
@@ -60,15 +63,13 @@
patchfiles patch-configure.ac.diff
-# update m4/intltool.m4 and autoreconf
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
- reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure.ac
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
}
-use_autoreconf yes
-autoreconf.args -fvi
+configure.cmd ./autogen.sh
configure.cflags-append -Wno-format-nonliteral
Deleted: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.12.1
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.12.1 2015-04-23 15:22:09 UTC (rev 135362)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.12.1 2015-04-23 15:22:11 UTC (rev 135363)
@@ -1,103 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
-# $Id: Portfile 116271 2014-01-23 17:32:19Z devans at macports.org $
-
-PortSystem 1.0
-
-name epiphany
-version 3.12.1
-license GPL-2+
-set branch [join [lrange [split ${version} .] 0 1] .]
-description A GNOME Web browser.
-long_description \
- A web browser is more than an application, it is a \
- way of thinking, it is a way of seeing the world. \
- Epiphany's principles are simplicity and standards \
- compliance.
-maintainers devans openmaintainer
-categories gnome www
-platforms darwin
-homepage https://wiki.gnome.org/Apps/Web
-master_sites gnome:sources/${name}/${branch}/
-
-use_xz yes
-
-checksums rmd160 6bfd416723c2af05511a5ccc7e889dc2aab55030 \
- sha256 16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93
-
-depends_build port:pkgconfig \
- port:intltool \
- port:gnome-common
-
-depends_lib port:desktop-file-utils \
- port:gnome-icon-theme \
- port:gnome-icon-theme-symbolic \
- port:gtk3 \
- path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
- port:gnome-desktop \
- port:libxslt\
- port:libsoup \
- port:libsecret \
- port:port:libnotify \
- port:libwnck3 \
- port:gsettings-desktop-schemas \
- port:nss \
- port:sqlite3 \
- port:gcr \
- port:avahi \
- port:xorg-libX11 \
- port:iso-codes
-
-depends_run port:gnome-settings-daemon
-
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
- depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
- depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
- }
-}
-
-# update m4/intltool.m4 and autoreconf
-
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
- reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure.ac
-}
-
-use_autoreconf yes
-autoreconf.args -fvi
-
-configure.cflags-append -Wno-format-nonliteral
-
-configure.args --with-distributor-name=MacPorts \
- --disable-schemas-compile \
- --disable-tests
-
-post-activate {
- system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
- system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
-}
-
-#
-# nss is not universal
-#
-
-if {[variant_isset universal]} {
- configure.args-append --disable-nss
- depends_lib-delete port:nss
-}
-
-livecheck.type gnome-with-unstable
Copied: users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh (from rev 134429, trunk/dports/gnome/epiphany/files/autogen.sh)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh 2015-04-23 15:22:11 UTC (rev 135363)
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="epiphany"
+
+(test -f $srcdir/src/ephy-window.c) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from GNOME git and make"
+ echo "sure the gnome-autogen.sh script is in your \$PATH."
+ exit 1
+}
+
+REQUIRED_AUTOMAKE_VERSION=1.11
+REQUIRED_LIBTOOL_VERSION=2.2
+REQUIRED_INTLTOOL_VERSION=0.40.4
+. gnome-autogen.sh
Modified: users/devans/GNOME-3/stable/dports/gnome/epiphany/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/epiphany/files/patch-configure.ac.diff 2015-04-23 15:22:09 UTC (rev 135362)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/files/patch-configure.ac.diff 2015-04-23 15:22:11 UTC (rev 135363)
@@ -1,5 +1,14 @@
---- configure.ac.orig 2013-05-31 03:28:55.000000000 -0700
-+++ configure.ac 2014-02-21 20:21:48.000000000 -0800
+--- configure.ac.orig 2015-03-25 08:15:37.000000000 -0700
++++ configure.ac 2015-03-25 08:16:05.000000000 -0700
+@@ -73,7 +73,7 @@
+ if test "$enable_maintainer_mode" = "yes"; then
+ AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
+ enable_debug=yes
+- DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
++ DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+ fi
+
+ GLIB_REQUIRED=2.35.6
@@ -90,7 +90,7 @@
AVAHI_REQUIRED=0.6.22
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150423/2cb8aba6/attachment-0001.html>
More information about the macports-changes
mailing list