[107296] trunk/dports/gnome/yelp

devans at macports.org devans at macports.org
Tue Jun 25 07:53:45 PDT 2013


Revision: 107296
          https://trac.macports.org/changeset/107296
Author:   devans at macports.org
Date:     2013-06-25 07:53:45 -0700 (Tue, 25 Jun 2013)
Log Message:
-----------
yelp: update to version 2.31.6, now uses webkit-gtk, builds universal.

Modified Paths:
--------------
    trunk/dports/gnome/yelp/Portfile

Added Paths:
-----------
    trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff
    trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff

Removed Paths:
-------------
    trunk/dports/gnome/yelp/files/automake-1.13.patch
    trunk/dports/gnome/yelp/files/missing-links.patch

Modified: trunk/dports/gnome/yelp/Portfile
===================================================================
--- trunk/dports/gnome/yelp/Portfile	2013-06-25 14:53:27 UTC (rev 107295)
+++ trunk/dports/gnome/yelp/Portfile	2013-06-25 14:53:45 UTC (rev 107296)
@@ -1,75 +1,70 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem      1.0
 
 name            yelp
-version         2.30.2
-revision        3
+version         2.31.6
 license         GPL-2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Help browser for GNOME.
-long_description Yelp is the default help browser for the \
+long_description \
+                Yelp is the default help browser for the \
                 GNOME desktop. Yelp provides a simple graphical \
                 interface for viewing DocBook, HTML, man, and info \
                 formatted documentation.
 maintainers     devans openmaintainer
 categories      gnome
 platforms       darwin
-supported_archs i386 ppc
 homepage        http://www.gnome.org/
 master_sites    gnome:sources/${name}/${branch}/
 
-checksums       md5     d745dafd0c134e726511894621d9b050 \
-                sha1    b36d36449ff19844a429b4e2bd5eaad0a7537281 \
-                rmd160  a92fde9f64489c5dee6a249964245b087aab5981
+use_bzip2       yes
 
+checksums       sha256  9f6080b79cbf4b73d682c47088b7320c871ae5c3ee3d38c86aa83321b444dede \
+                rmd160  5eddca1e9f63982f6158c060537900f9e13722d3
+
 depends_build   port:pkgconfig \
                 port:intltool \
-                port:gnome-doc-utils
+                port:gnome-doc-utils \
+                port:desktop-file-utils
 
 depends_lib     port:gconf \
                 port:startup-notification \
                 port:xz \
-                path:lib/pkgconfig/libxul.pc:xulrunner
-#
-#       currently only builds correctly on 32 bit platforms
-#       due to problems with xulrunner and/or its dependencies
-#       (nss for instance).
-#
-#       see https://bugzilla.mozilla.org/show_bug.cgi?id=529878
-#
-#       update: builds 32 bit on x86_64 platform using
-#       xulrunner +internal_dependencies (r73873 and later)
-#
+                port:pangox-compat \
+                port:webkit-gtk \
+                port:yelp-xsl
 
-use_bzip2       yes
+patchfiles      patch-src-yelp-application.c.diff \
+                patch-yelp.desktop.in.in.diff
 
-patchfiles      missing-links.patch automake-1.13.patch
-use_autoreconf  yes
-autoreconf.args -fvi
+compiler.blacklist clang
 
-configure.cppflags-append  -I${prefix}/include/nspr
+#
+# compiling yelp with -O2 produces
+# a binary that segfaults on startup
+# TODO: find out why
+#
 
+configure.optflags-delete -O2
+
 configure.args  --x-includes=${prefix}/include \
                 --x-libraries=${prefix}/lib \
-                --disable-schemas-install \
-                --enable-debug \
-                --with-search=basic \
-                --with-gecko=libxul-embedding
+                --with-x \
+                --disable-schemas-compile \
+                --disable-silent-rules \
+                --enable-debug
 
-variant debug description {Enables debugging} {
-        configure.cflags-append -O0 -g
-        configure.cxxflags-append -O0 -g
-        configure.args-append --enable-debug
+post-destroot {
+    set gsettingsschemadir ${prefix}/share/glib-2.0/schemas
+    file mkdir ${destroot}${gsettingsschemadir}
+    file copy [glob ${worksrcpath}/data/*.gschema.xml] ${destroot}${gsettingsschemadir}
 }
 
 post-activate {
-        system "${prefix}/bin/scrollkeeper-update; true"
-        system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications; true"
-        system "${prefix}/bin/update-mime-database ${prefix}/share/mime; true"
-        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"
+    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
-livecheck.type  gnome
+livecheck.type  gnome-with-unstable

Deleted: trunk/dports/gnome/yelp/files/automake-1.13.patch
===================================================================
--- trunk/dports/gnome/yelp/files/automake-1.13.patch	2013-06-25 14:53:27 UTC (rev 107295)
+++ trunk/dports/gnome/yelp/files/automake-1.13.patch	2013-06-25 14:53:45 UTC (rev 107296)
@@ -1,10 +0,0 @@
---- configure.in.orig	2013-02-10 23:53:31.000000000 -0800
-+++ configure.in	2013-02-10 23:53:48.000000000 -0800
-@@ -19,7 +19,6 @@ AM_GCONF_SOURCE_2
- AC_PROG_LN_S
- AC_PROG_CC
- AC_PROG_CXX
--AM_PROG_CC_STDC
- AC_ISC_POSIX
- AC_HEADER_STDC
- AM_PROG_LIBTOOL

Deleted: trunk/dports/gnome/yelp/files/missing-links.patch
===================================================================
--- trunk/dports/gnome/yelp/files/missing-links.patch	2013-06-25 14:53:27 UTC (rev 107295)
+++ trunk/dports/gnome/yelp/files/missing-links.patch	2013-06-25 14:53:45 UTC (rev 107296)
@@ -1,10 +0,0 @@
---- configure.in.orig	2010-09-28 07:12:10.000000000 -0700
-+++ configure.in	2013-02-10 23:51:58.000000000 -0800
-@@ -68,6 +68,7 @@ AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR
- PKG_CHECK_MODULES(YELP,
- [
- 	gio-2.0
-+	gthread-2.0
- 	gconf-2.0
- 	gnome-doc-utils >= 0.19.1
- 	gtk+-unix-print-2.0

Added: trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff
===================================================================
--- trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff	                        (rev 0)
+++ trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff	2013-06-25 14:53:45 UTC (rev 107296)
@@ -0,0 +1,11 @@
+--- src/yelp-application.c.orig	2012-09-19 13:42:52.000000000 -0700
++++ src/yelp-application.c	2012-09-19 13:44:43.000000000 -0700
+@@ -224,7 +224,7 @@
+         gchar *keyfile = g_build_filename (g_get_user_config_dir (),
+                                            "yelp", "yelp.cfg",
+                                            NULL);
+-        priv->backend = g_keyfile_settings_backend_new (keyfile);
++        priv->backend = g_keyfile_settings_backend_new (keyfile, "/apps/yelp/", "yelp");
+         priv->gsettings = g_settings_new_with_backend ("org.gnome.yelp",
+                                                        priv->backend);
+         g_free (keyfile);

Added: trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff
===================================================================
--- trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff	                        (rev 0)
+++ trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff	2013-06-25 14:53:45 UTC (rev 107296)
@@ -0,0 +1,19 @@
+--- yelp.desktop.in.in.orig	2013-06-23 12:34:44.000000000 -0700
++++ yelp.desktop.in.in	2013-06-23 12:36:10.000000000 -0700
+@@ -2,13 +2,14 @@
+ _Name=Help
+ _Comment=Get help with GNOME
+ OnlyShowIn=GNOME;
+-Exec=yelp
++Exec=yelp %u
+ Icon=help-browser
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;Core;Documentation;
++Categories=GNOME;GTK;Core;Documentation;Utility;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=Yelp
+ X-GNOME-Bugzilla-Component=general
+ X-GNOME-Bugzilla-Version=@VERSION@
++MimeType=x-scheme-handler/ghelp;x-scheme-handler/help;x-scheme-handler/info;x-scheme-handler/man;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130625/67efed31/attachment.html>


More information about the macports-changes mailing list