[136135] trunk/dports/gnome/gcr
devans at macports.org
devans at macports.org
Mon May 11 13:50:34 PDT 2015
Revision: 136135
https://trac.macports.org/changeset/136135
Author: devans at macports.org
Date: 2015-05-11 13:50:34 -0700 (Mon, 11 May 2015)
Log Message:
-----------
gcr: update to version 3.15.92, reconfigure using upstream autogen.sh for intltool 0.51 compatibility, use gnome unstable livecheck.
Modified Paths:
--------------
trunk/dports/gnome/gcr/Portfile
Added Paths:
-----------
trunk/dports/gnome/gcr/files/autogen.sh
Removed Paths:
-------------
trunk/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff
Property Changed:
----------------
trunk/dports/gnome/gcr/
Property changes on: trunk/dports/gnome/gcr
___________________________________________________________________
Modified: svn:mergeinfo
- /users/devans/GNOME-3/stable/dports/gnome/gcr:113175-132067
/users/devans/GNOME-3/unstable/dports/gnome/gcr:117866-118152,125236-125720
+ /users/devans/GNOME-3/stable/dports/gnome/gcr:113175-136044
/users/devans/GNOME-3/unstable/dports/gnome/gcr:117866-118152,125236-125720,133860-134402
Modified: trunk/dports/gnome/gcr/Portfile
===================================================================
--- trunk/dports/gnome/gcr/Portfile 2015-05-11 20:50:32 UTC (rev 136134)
+++ trunk/dports/gnome/gcr/Portfile 2015-05-11 20:50:34 UTC (rev 136135)
@@ -6,7 +6,7 @@
PortGroup gobject_introspection 1.0
name gcr
-version 3.14.0
+version 3.15.92
license LGPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description GCR is a library for displaying certificates, and crypto UI, accessing \
@@ -24,11 +24,16 @@
use_xz yes
-checksums rmd160 6b368a77b74504e9abcfc02ed8b209bd2b5a1735 \
- sha256 2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d
+checksums rmd160 bcb9b948797acbf6cd86c05e2abe65e818e02a46 \
+ sha256 ebdb15ef5277b0e66863649a7bccde60f8e20d3ceed8be976878b46cf129e012
depends_build port:pkgconfig \
- port:intltool
+ port:intltool \
+ port:gtk-doc \
+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib port:desktop-file-utils \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
@@ -38,26 +43,25 @@
port:gnupg \
port:vala
+gobject_introspection yes
+
patchfiles patch-egg-egg-asn1x.h.diff \
patch-egg-egg-armor.c.diff \
- patch-ui-gcr.pc.in.diff \
- patch-gcr-Makefile.am.diff
+ patch-ui-gcr.pc.in.diff
# gcr uses X11 specific code in UI (#41839)
# https://bugzilla.gnome.org/show_bug.cgi?id=734366
# https://bugzilla.gnome.org/show_bug.cgi?id=688678
require_active_variants port:gtk3 x11
-gobject_introspection yes
-# update build/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}/build/m4
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
}
-use_autoreconf yes
-autoreconf.args -fvi
+configure.cmd ./autogen.sh
configure.args --enable-vala=yes \
--disable-schemas-compile \
@@ -81,4 +85,4 @@
system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
}
-livecheck.type gnome
+livecheck.type gnome-with-unstable
Copied: trunk/dports/gnome/gcr/files/autogen.sh (from rev 136044, users/devans/GNOME-3/stable/dports/gnome/gcr/files/autogen.sh)
===================================================================
--- trunk/dports/gnome/gcr/files/autogen.sh (rev 0)
+++ trunk/dports/gnome/gcr/files/autogen.sh 2015-05-11 20:50:34 UTC (rev 136135)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+PKG_NAME="gcr"
+USE_GNOME2_MACROS=1
+REQUIRED_AUTOMAKE_VERSION=1.11
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+( test -f $srcdir/configure.ac ) || {
+ 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 the GNOME Git"
+ exit 1
+}
+
+. gnome-autogen.sh
Deleted: trunk/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff 2015-05-11 20:50:32 UTC (rev 136134)
+++ trunk/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff 2015-05-11 20:50:34 UTC (rev 136135)
@@ -1,19 +0,0 @@
---- gcr/Makefile.am.orig 2014-09-23 00:40:08.000000000 -0700
-+++ gcr/Makefile.am 2014-12-04 21:59:38.000000000 -0800
-@@ -159,13 +159,13 @@ gcr/gcr-dbus-generated.c: $(DBUS_XML_DEF
- $(AM_V_GEN) $(GDBUS_CODEGEN) --interface-prefix org.gnome.keyring.internal. \
- --generate-c-code gcr/gcr-dbus-generated --c-namespace GcrDBus $^
- $(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
-+ gcr/gcr-dbus-generated.h > gcr/gcr-dbus-generated.h.tmp && \
-+ mv gcr/gcr-dbus-generated.h.tmp gcr/gcr-dbus-generated.h
-+ $(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
- gcr/gcr-dbus-generated.c > gcr/gcr-dbus-generated.c.tmp && \
- mv gcr/gcr-dbus-generated.c.tmp gcr/gcr-dbus-generated.c
-
- gcr/gcr-dbus-generated.h: gcr/gcr-dbus-generated.c
-- $(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
-- gcr/gcr-dbus-generated.h > gcr/gcr-dbus-generated.h.tmp && \
-- mv gcr/gcr-dbus-generated.h.tmp gcr/gcr-dbus-generated.h
-
- pkgconfig_DATA += \
- gcr-base-$(GCR_MAJOR).pc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150511/70ad35e1/attachment-0001.html>
More information about the macports-changes
mailing list