[113255] trunk/dports/gnome/devhelp
devans at macports.org
devans at macports.org
Wed Nov 13 00:24:40 PST 2013
Revision: 113255
https://trac.macports.org/changeset/113255
Author: devans at macports.org
Date: 2013-11-13 00:24:40 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
devhelp: merge version 3.8.2 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/devhelp/Portfile
trunk/dports/gnome/devhelp/files/patch-configure.diff
Removed Paths:
-------------
trunk/dports/gnome/devhelp/files/patch-src-Makefile.in.diff
Property Changed:
----------------
trunk/dports/gnome/devhelp/
Property changes on: trunk/dports/gnome/devhelp
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/devhelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/devhelp:108269-113174
/users/rmstonecipher/gnome/devhelp:102363-103172
Modified: trunk/dports/gnome/devhelp/Portfile
===================================================================
--- trunk/dports/gnome/devhelp/Portfile 2013-11-13 08:23:19 UTC (rev 113254)
+++ trunk/dports/gnome/devhelp/Portfile 2013-11-13 08:24:40 UTC (rev 113255)
@@ -4,7 +4,7 @@
PortSystem 1.0
name devhelp
-version 2.32.0
+version 3.8.2
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description Devhelp is an API documentation browser for GTK+ and GNOME.
@@ -17,54 +17,45 @@
maintainers devans openmaintainer
categories gnome
platforms darwin
-homepage http://live.gnome.org/${name}
+homepage http://live.gnome.org/Apps/Devhelp
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 934697815ec13a5629db775bb3b8585c80c8c6f0 \
- sha256 61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4
+checksums rmd160 8d855f485742a0bdc766591d36af09bdbea61801 \
+ sha256 a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7
-patchfiles patch-configure.diff \
- patch-src-Makefile.in.diff
+patchfiles patch-configure.diff
depends_build port:pkgconfig \
port:intltool
depends_lib port:desktop-file-utils \
- port:webkit-gtk \
- port:gconf \
- port:icu \
- port:jpeg \
- port:libwnck \
- port:libunique
+ port:gnome-icon-theme \
+ port:gtk3 \
+ port:webkit-gtk3
-configure.args --disable-schemas-install
+configure.args --with-webkit2=no \
+ --disable-schemas-compile
-variant python25 conflicts python26 python27 description {Build using Python 2.5} {
- configure.python ${prefix}/bin/python2.5
- depends_build-append port:python25
-}
-
-variant python26 conflicts python25 python27 description {Build using Python 2.6} {
+variant python26 conflicts python27 description {Build using Python 2.6} {
configure.python ${prefix}/bin/python2.6
depends_build-append port:python26
}
-variant python27 conflicts python25 python26 description {Build using Python 2.7} {
+variant python27 conflicts python26 description {Build using Python 2.7} {
configure.python ${prefix}/bin/python2.7
depends_build-append port:python27
}
-if {![variant_isset python25] && ![variant_isset python26]} {
+if {![variant_isset python26]} {
default_variants +python27
}
post-activate {
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
livecheck.type gnome
Modified: trunk/dports/gnome/devhelp/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/devhelp/files/patch-configure.diff 2013-11-13 08:23:19 UTC (rev 113254)
+++ trunk/dports/gnome/devhelp/files/patch-configure.diff 2013-11-13 08:24:40 UTC (rev 113255)
@@ -1,6 +1,6 @@
---- configure.orig 2010-09-27 13:36:55.000000000 -0700
-+++ configure 2013-05-06 18:33:03.000000000 -0700
-@@ -13679,9 +13679,9 @@
+--- configure.orig 2013-05-15 04:07:33.000000000 -0700
++++ configure 2013-08-03 06:37:28.000000000 -0700
+@@ -15341,9 +15341,9 @@
Deleted: trunk/dports/gnome/devhelp/files/patch-src-Makefile.in.diff
===================================================================
--- trunk/dports/gnome/devhelp/files/patch-src-Makefile.in.diff 2013-11-13 08:23:19 UTC (rev 113254)
+++ trunk/dports/gnome/devhelp/files/patch-src-Makefile.in.diff 2013-11-13 08:24:40 UTC (rev 113255)
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig 2010-09-27 13:36:56.000000000 -0700
-+++ src/Makefile.in 2013-05-06 18:30:24.000000000 -0700
-@@ -334,7 +334,6 @@
- -DDATADIR=\""$(datadir)"\" \
- -DG_LOG_DOMAIN=\"Devhelp\" \
- -DGDK_DISABLE_DEPRECATED \
-- -DGTK_DISABLE_DEPRECATED \
- -DG_DISABLE_SINGLE_INCLUDES \
- -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
- -DGTK_DISABLE_SINGLE_INCLUDES \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/83a6ef8f/attachment.html>
More information about the macports-changes
mailing list