Allow Anjuta to compile with Subversion 1.8. Patch submitted upstream.
ok ajacoutot jasper
This commit is contained in:
stsp
parent
d78e929867
commit
e60ca17626
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.102 2013/10/06 15:47:03 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.103 2013/10/10 09:55:24 stsp Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -6,7 +6,7 @@ COMMENT= versatile IDE for GNOME
|
||||
|
||||
GNOME_PROJECT= anjuta
|
||||
GNOME_VERSION= 3.10.0
|
||||
REVISION= 1
|
||||
REVISION= 2
|
||||
|
||||
SHARED_LIBS += anjuta-3 0.0 # 0.0
|
||||
|
||||
@ -28,11 +28,11 @@ WANTLIB += gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstfft-1.0 gstpbutils-1.0
|
||||
WANTLIB += gstreamer-1.0 gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3
|
||||
WANTLIB += gtksourceview-3.0 harfbuzz harfbuzz-icu heimbase icudata
|
||||
WANTLIB += icui18n icuuc javascriptcoregtk-3.0 jpeg krb5 m magic
|
||||
WANTLIB += ncurses neon pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += pcre pixman-1 png proxy pthread pthread-stubs roken
|
||||
WANTLIB += ncurses serf-1 pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += pcre pixman-1 png pthread pthread-stubs roken
|
||||
WANTLIB += sasl2 secret-1 soup-2.4 sqlite3 ssl stdc++ svn_client-1
|
||||
WANTLIB += svn_delta-1 svn_diff-1 svn_fs-1 svn_fs_base-1 svn_fs_fs-1
|
||||
WANTLIB += svn_fs_util-1 svn_ra-1 svn_ra_local-1 svn_ra_neon-1
|
||||
WANTLIB += svn_fs_util-1 svn_ra-1 svn_ra_local-1 svn_ra_serf-1
|
||||
WANTLIB += svn_ra_svn-1 svn_repos-1 svn_subr-1 svn_wc-1 util vala-0.22
|
||||
WANTLIB += vte2_90 webkit2gtk-3.0 webp wind xcb xcb-render xcb-shm
|
||||
WANTLIB += xml2 xslt z orc-0.4
|
||||
@ -74,8 +74,11 @@ MODGNOME_TOOLS= gi yelp vala
|
||||
|
||||
YACC= bison -y
|
||||
|
||||
AUTOCONF_VERSION= 2.69
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_ARGS+= --disable-static \
|
||||
--with-symbol-db-shm=/tmp
|
||||
--with-symbol-db-shm=/tmp \
|
||||
--disable-neon
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/plugins/project-wizard/templates/pygtk.wiz.in \
|
||||
|
||||
91
x11/gnome/anjuta/patches/patch-configure_ac
Normal file
91
x11/gnome/anjuta/patches/patch-configure_ac
Normal file
@ -0,0 +1,91 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.12 2013/10/10 09:55:24 stsp Exp $
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=709752
|
||||
--- configure.ac.orig Mon Sep 16 03:23:08 2013
|
||||
+++ configure.ac Wed Oct 9 18:48:40 2013
|
||||
@@ -58,6 +58,7 @@ GI_REQUIRED=0.9.5
|
||||
|
||||
dnl Subversion plugin
|
||||
NEON_REQUIRED=0.28.2
|
||||
+SERF_REQUIRED=1.2.0
|
||||
SVN_MAJOR=1
|
||||
SVN_MINOR=5
|
||||
SVN_PATCH=0
|
||||
@@ -653,6 +654,7 @@ fi
|
||||
dnl ******************************************************************
|
||||
dnl Check for extra libs required by subversion.
|
||||
dnl FIXME: This should actually be done by subversion and not by us.
|
||||
+dnl See http://subversion.tigris.org/issues/show_bug.cgi?id=4435
|
||||
dnl ******************************************************************
|
||||
|
||||
AC_ARG_ENABLE(plugin-subversion,
|
||||
@@ -662,6 +664,20 @@ AC_ARG_ENABLE(plugin-subversion,
|
||||
fi ],
|
||||
[ user_disabled_subversion=0 ] )
|
||||
|
||||
+AC_ARG_ENABLE(neon,
|
||||
+ AS_HELP_STRING([--disable-neon],[Disable neon support in Subversion plugin]),
|
||||
+ [ if test "$enableval" = "no"; then
|
||||
+ user_disabled_neon=1
|
||||
+ fi ],
|
||||
+ [ user_disabled_neon=0 ])
|
||||
+
|
||||
+AC_ARG_ENABLE(serf,
|
||||
+ AS_HELP_STRING([--disable-serf],[Disable serf support in Subversion plugin]),
|
||||
+ [ if test "$enableval" = "no"; then
|
||||
+ user_disabled_serf=1
|
||||
+ fi ],
|
||||
+ [ user_disabled_serf=0 ])
|
||||
+
|
||||
AC_MSG_CHECKING(if subversion support is disabled)
|
||||
if test "$user_disabled_subversion" = 1; then
|
||||
AC_MSG_RESULT(yes)
|
||||
@@ -692,15 +708,26 @@ if test -n "$SVN_INCLUDE" ; then
|
||||
SVN_INCLUDE=""
|
||||
fi
|
||||
|
||||
- dnl -----------------------------------------
|
||||
- dnl NEON. Required by subversion (devel)
|
||||
- dnl------------------------------------------
|
||||
- have_neon=no
|
||||
- PKG_CHECK_MODULES(NEON, \
|
||||
- neon, have_neon=yes, have_neon=no)
|
||||
- if test x"$have_neon" = "xno"; then
|
||||
- SVN_INCLUDE=""
|
||||
+ dnl ----------------------------------------------------------
|
||||
+ dnl NEON/SERF. Required by subversion (devel) for HTTP support
|
||||
+ dnl-----------------------------------------------------------
|
||||
+ # Subversion <= 1.7 relies on neon (recommended) or serf.
|
||||
+ # Subversion 1.8 dropped neon support and uses serf to talk
|
||||
+ # to HTTP servers.
|
||||
+ #
|
||||
+ # Subversion can be built without HTTP client support so neon and
|
||||
+ # serf aren't hard requirements. But if present on the system
|
||||
+ # it is reasonable to assume that Subversion is linked to them.
|
||||
+ if test "$user_disabled_neon" = 0; then
|
||||
+ have_neon=no
|
||||
+ PKG_CHECK_MODULES(NEON, \
|
||||
+ neon, have_neon=yes, have_neon=no)
|
||||
fi
|
||||
+ if test "$user_disabled_serf" = 0; then
|
||||
+ have_serf=no
|
||||
+ PKG_CHECK_MODULES(SERF, \
|
||||
+ serf-1, have_serf=yes, have_serf=no)
|
||||
+ fi
|
||||
|
||||
dnl Make sure our SVN version is high enough
|
||||
dnl Eww, eww, eww, this is dirty
|
||||
@@ -730,11 +757,11 @@ dnl ------------------------------------------
|
||||
if test -n "$SVN_INCLUDE" ; then
|
||||
SVN_INCLUDE="-I$SVN_INCLUDE"
|
||||
if test x != "x$SVN_LIB" ; then
|
||||
- SVN_LIB="-L$SVN_LIB $APR_LIBS $APR_UTILS_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
|
||||
+ SVN_LIB="-L$SVN_LIB $APR_LIBS $APR_UTILS_LIBS $NEON_LIBS $SERF_LIBS -lsvn_client-1 -lsvn_subr-1"
|
||||
else
|
||||
- SVN_LIB="$APR_LIBS $APR_UTILS_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
|
||||
+ SVN_LIB="$APR_LIBS $APR_UTILS_LIBS $NEON_LIBS $SERF_LIBS -lsvn_client-1 -lsvn_subr-1"
|
||||
fi
|
||||
- SVN_CFLAGS="$APR_CFLAGS $APR_UTILS_CFLAGS $NEON_CFLAGS"
|
||||
+ SVN_CFLAGS="$APR_CFLAGS $APR_UTILS_CFLAGS $NEON_CFLAGS $SERF_CFLAGS"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])
|
||||
Loading…
x
Reference in New Issue
Block a user