[136132] trunk/dports/gnome/yelp

devans at macports.org devans at macports.org
Mon May 11 13:07:13 PDT 2015


Revision: 136132
          https://trac.macports.org/changeset/136132
Author:   devans at macports.org
Date:     2015-05-11 13:07:13 -0700 (Mon, 11 May 2015)
Log Message:
-----------
yelp: update to version 3.16.0, reconfigure using upstream autogen.sh for intltool 0.51 compatibility, minimize compile warnings.

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

Added Paths:
-----------
    trunk/dports/gnome/yelp/files/patch-m4-ax_compiler_flags_ldflags.m4.diff

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

Property Changed:
----------------
    trunk/dports/gnome/yelp/


Property changes on: trunk/dports/gnome/yelp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/yelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/yelp:108269-127493
/users/devans/GNOME-3/unstable/dports/gnome/yelp:114069-118154,121400-125723
/users/rmstonecipher/gnome/yelp:102363-103172
   + /branches/mld-qt-481/dports/gnome/yelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/yelp:108269-136044
/users/devans/GNOME-3/unstable/dports/gnome/yelp:114069-118154,121400-125723,133231-134389
/users/rmstonecipher/gnome/yelp:102363-103172

Modified: trunk/dports/gnome/yelp/Portfile
===================================================================
--- trunk/dports/gnome/yelp/Portfile	2015-05-11 20:07:11 UTC (rev 136131)
+++ trunk/dports/gnome/yelp/Portfile	2015-05-11 20:07:13 UTC (rev 136132)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                yelp
-version             3.14.1
+version             3.16.0
 license             GPL-2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Help browser for GNOME.
@@ -20,13 +20,17 @@
 
 use_xz              yes
 
-checksums           rmd160  2799875fb4760877f0f7fb4c3fa85850fc6fda8b \
-                    sha256  1df24b0afa000fd7b003b43448be5227d72757e95e678a7be1832ebea685f072
+checksums           rmd160  58a9a74028a53cf6d4d4b0469f44ce5c611c0fd7 \
+                    sha256  238baa442a8ffe8db2e3d423329409a4e3bc9436d5f63f520c64fc875e70e22b
 
 depends_build       port:pkgconfig \
                     port:intltool \
                     port:itstool \
-                    port:gnome-common
+                    port:gnome-common \
+                    port:autoconf \
+                    port:automake \
+                    port:libtool \
+                    port:gtk-doc
 
 depends_lib         port:desktop-file-utils \
                     port:gtk3 \
@@ -45,17 +49,15 @@
                     port:gnome-getting-started-docs \
                     port:gnome-settings-daemon
 
-# update m4/intltool.m4 and autoreconf
+patchfiles          patch-m4-ax_compiler_flags_ldflags.m4.diff
 
-pre-configure {
-    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
-}
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
-use_autoreconf          yes
-autoreconf.args         -fvi
+configure.cmd       ./autogen.sh
 
 configure.args      --x-includes=${prefix}/include \
                     --x-libraries=${prefix}/lib \
+                    --enable-compile-warnings=minimum \
                     --disable-schemas-compile \
                     --disable-silent-rules \
                     --enable-debug

Deleted: trunk/dports/gnome/yelp/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/yelp/files/patch-configure.ac.diff	2015-05-11 20:07:11 UTC (rev 136131)
+++ trunk/dports/gnome/yelp/files/patch-configure.ac.diff	2015-05-11 20:07:13 UTC (rev 136132)
@@ -1,10 +0,0 @@
---- configure.ac.orig	2013-06-29 08:34:42.000000000 -0700
-+++ configure.ac	2013-06-29 08:35:10.000000000 -0700
-@@ -29,6 +29,7 @@ PKG_CHECK_MODULES(YELP,
- [
- 	gio-2.0 >= 2.25.10
- 	gio-unix-2.0
-+	gthread-2.0
- 	gtk+-unix-print-2.0
- 	gtk+-2.0 >= 2.18.0
- 	libxml-2.0 >= 2.6.5

Copied: trunk/dports/gnome/yelp/files/patch-m4-ax_compiler_flags_ldflags.m4.diff (from rev 136044, users/devans/GNOME-3/stable/dports/gnome/yelp/files/patch-m4-ax_compiler_flags_ldflags.m4.diff)
===================================================================
--- trunk/dports/gnome/yelp/files/patch-m4-ax_compiler_flags_ldflags.m4.diff	                        (rev 0)
+++ trunk/dports/gnome/yelp/files/patch-m4-ax_compiler_flags_ldflags.m4.diff	2015-05-11 20:07:13 UTC (rev 136132)
@@ -0,0 +1,10 @@
+--- m4/ax_compiler_flags_ldflags.m4.orig	2015-03-11 16:01:32.000000000 -0700
++++ m4/ax_compiler_flags_ldflags.m4	2015-03-11 16:06:33.000000000 -0700
+@@ -49,7 +49,6 @@
+ 
+     # Base flags
+     AX_APPEND_COMPILE_FLAGS([ dnl
+-        -Wl,--no-as-needed dnl
+         $3 dnl
+     ],ax_warn_ldflags_variable,[$ax_compiler_flags_test])
+ 

Deleted: trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff
===================================================================
--- trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff	2015-05-11 20:07:11 UTC (rev 136131)
+++ trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff	2015-05-11 20:07:13 UTC (rev 136132)
@@ -1,11 +0,0 @@
---- 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);

Deleted: trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff
===================================================================
--- trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff	2015-05-11 20:07:11 UTC (rev 136131)
+++ trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff	2015-05-11 20:07:13 UTC (rev 136132)
@@ -1,19 +0,0 @@
---- 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: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150511/7e488fc5/attachment.html>


More information about the macports-changes mailing list