[135558] trunk/dports/gnome/gtksourceview
devans at macports.org
devans at macports.org
Sun Apr 26 06:22:55 PDT 2015
Revision: 135558
https://trac.macports.org/changeset/135558
Author: devans at macports.org
Date: 2015-04-26 06:22:55 -0700 (Sun, 26 Apr 2015)
Log Message:
-----------
gtksourceview: patch to fix build, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.
Modified Paths:
--------------
trunk/dports/gnome/gtksourceview/Portfile
Added Paths:
-----------
trunk/dports/gnome/gtksourceview/files/autogen.sh
trunk/dports/gnome/gtksourceview/files/patch-configure.in.diff
trunk/dports/gnome/gtksourceview/files/patch-gconst_return.diff
Modified: trunk/dports/gnome/gtksourceview/Portfile
===================================================================
--- trunk/dports/gnome/gtksourceview/Portfile 2015-04-26 08:58:23 UTC (rev 135557)
+++ trunk/dports/gnome/gtksourceview/Portfile 2015-04-26 13:22:55 UTC (rev 135558)
@@ -29,7 +29,10 @@
depends_build port:intltool \
port:pkgconfig \
port:gnome-common \
- port:gtk-doc
+ port:gtk-doc \
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib port:gtk2 \
port:gnome-vfs \
@@ -39,15 +42,22 @@
port:gettext \
port:gnuregex
-patchfiles patch-glib-2.32.diff \
+patchfiles patch-configure.in.diff \
+ patch-glib-2.32.diff \
+ patch-gconst_return.diff \
patch-gtksourceregex.c.diff \
patch-gtksourcelanguage.c.diff
-# autoreconf to reconfigure with our intltool.m4
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-use_autoreconf yes
-autoreconf.args -fvi
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+configure.cmd ./autogen.sh
+
+configure.args --enable-compile-warnings=minimum
+
#test-widget.c:186:26: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
# tmp = g_strdup_vprintf (msg, ap);
# ^~~
@@ -57,7 +67,7 @@
# TODO: fix code rather than suppress fatal error
configure.cflags-append \
- -Wno-error=format-nonliteral -Wno-error=format-security
+ -Wno-error=format-nonliteral -Wno-error=format-security -Wno-implicit-function-declaration
livecheck.type regex
livecheck.url http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
Added: trunk/dports/gnome/gtksourceview/files/autogen.sh
===================================================================
--- trunk/dports/gnome/gtksourceview/files/autogen.sh (rev 0)
+++ trunk/dports/gnome/gtksourceview/files/autogen.sh 2015-04-26 13:22:55 UTC (rev 135558)
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="gtksourceview"
+
+(test -f $srcdir/configure.in \
+ && test -f $srcdir/README \
+ && test -d $srcdir/gtksourceview) || {
+ 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 CVS"
+ exit 1
+}
+
+REQUIRED_AUTOMAKE_VERSION=1.7.2
+
+USE_GNOME2_MACROS=1 NOCONFIGURE=1 . gnome-autogen.sh
+conf_flags="--enable-maintainer-mode --enable-gtk-doc"
+echo $srcdir/configure $conf_flags "$@"
+$srcdir/configure $conf_flags "$@"
+
Added: trunk/dports/gnome/gtksourceview/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/gtksourceview/files/patch-configure.in.diff (rev 0)
+++ trunk/dports/gnome/gtksourceview/files/patch-configure.in.diff 2015-04-26 13:22:55 UTC (rev 135558)
@@ -0,0 +1,11 @@
+--- configure.in.orig 2015-04-26 06:14:05.000000000 -0700
++++ configure.in 2015-04-26 06:14:34.000000000 -0700
+@@ -45,7 +45,7 @@
+ GNOME_COMMON_INIT
+ if test x$MAINT = x; then
+ GNOME_COMPILE_WARNINGS(error)
+- DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
++ DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
+ else
+ GNOME_COMPILE_WARNINGS(maximum)
+ DEPRECATED_FLAGS=""
Added: trunk/dports/gnome/gtksourceview/files/patch-gconst_return.diff
===================================================================
--- trunk/dports/gnome/gtksourceview/files/patch-gconst_return.diff (rev 0)
+++ trunk/dports/gnome/gtksourceview/files/patch-gconst_return.diff 2015-04-26 13:22:55 UTC (rev 135558)
@@ -0,0 +1,26 @@
+diff -ur gtksourceview.orig/gtksourcemarker.c gtksourceview/gtksourcemarker.c
+--- gtksourceview.orig/gtksourcemarker.c 2015-04-26 06:05:08.000000000 -0700
++++ gtksourceview/gtksourcemarker.c 2015-04-26 06:06:45.000000000 -0700
+@@ -110,7 +110,7 @@
+ *
+ * Return value: the name.
+ **/
+-G_CONST_RETURN gchar *
++const gchar *
+ gtk_source_marker_get_name (GtkSourceMarker *marker)
+ {
+ g_return_val_if_fail (marker != NULL, NULL);
+Only in gtksourceview: gtksourcemarker.c-e
+diff -ur gtksourceview.orig/gtksourcemarker.h gtksourceview/gtksourcemarker.h
+--- gtksourceview.orig/gtksourcemarker.h 2015-04-26 06:05:08.000000000 -0700
++++ gtksourceview/gtksourcemarker.h 2015-04-26 06:06:45.000000000 -0700
+@@ -41,7 +41,7 @@
+ const gchar *type);
+ gchar *gtk_source_marker_get_marker_type (GtkSourceMarker *marker);
+ gint gtk_source_marker_get_line (GtkSourceMarker *marker);
+-G_CONST_RETURN gchar *gtk_source_marker_get_name (GtkSourceMarker *marker);
++const gchar *gtk_source_marker_get_name (GtkSourceMarker *marker);
+ GtkSourceBuffer *gtk_source_marker_get_buffer (GtkSourceMarker *marker);
+ GtkSourceMarker *gtk_source_marker_next (GtkSourceMarker *marker);
+ GtkSourceMarker *gtk_source_marker_prev (GtkSourceMarker *marker);
+Only in gtksourceview: gtksourcemarker.h-e
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150426/9f286365/attachment.html>
More information about the macports-changes
mailing list