mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-13 07:34:50 +00:00
Update anjuta to 3.14.1
Update anjuta-extras to 3.10.0. This unbreak the build of these ports and fixed a run-time issues with autogen [1] PR: 185575 [1] PR: 193073 [1] Submitted by: Ivan Klymenko, Jimmy Kelley Network sponsored by: BSDCan and UoO
This commit is contained in:
Koop Mast
parent
f5c63499d2
commit
b25cb55b23
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=389156
@ -1,28 +1,29 @@
|
||||
# Created by: Koop Mast <kwm@FreeBSD.org>
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/devel/anjuta-extras/Makefile,v 1.11 2010/09/29 12:14:23 kwm Exp $
|
||||
|
||||
PORTNAME= anjuta-extras
|
||||
PORTVERSION= 2.32.1.1
|
||||
PORTREVISION= 4
|
||||
PORTVERSION= 3.10.0
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= GNOME
|
||||
|
||||
MAINTAINER= gnome@FreeBSD.org
|
||||
COMMENT= Extra anjuta plugins
|
||||
COMMENT= Extra anjuta 3 plugins
|
||||
|
||||
LIB_DEPENDS= libanjuta.so:${PORTSDIR}/devel/anjuta
|
||||
BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
|
||||
LIB_DEPENDS= libanjuta-3.so:${PORTSDIR}/devel/anjuta
|
||||
|
||||
USES= gmake libtool:keepla tar:bzip2
|
||||
USES= gettext gmake libtool pkgconfig tar:xz
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
INSTALL_TARGET= install-strip
|
||||
USE_GNOME= intltool
|
||||
USE_GNOME= gtk30 intltool libxml2
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
CONFIGURE_ARGS+=--disable-plugin-valgrind \
|
||||
--localedir=${PREFIX}/share
|
||||
|
||||
GCONF_SCHEMAS= anjuta-editor-scintilla.schemas
|
||||
GLIB_SCHEMAS= org.gnome.anjuta.plugins.scintilla.gschema.xml \
|
||||
org.gnome.anjuta.plugins.scratchbox.gschema.xml
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|return style_data|return|g' \
|
||||
${WRKSRC}/plugins/scintilla/style-editor.c
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (anjuta-extras-2.32.1.1.tar.bz2) = 0461b78eaa11b7a930001024c4db2484863b35f5f52acaa23c568bc6355414a4
|
||||
SIZE (anjuta-extras-2.32.1.1.tar.bz2) = 2688180
|
||||
SHA256 (anjuta-extras-3.10.0.tar.xz) = 92f92e3c530f5649edfe4d8645e8cfd3161383cbc486c636ebb24cf2d2642213
|
||||
SIZE (anjuta-extras-3.10.0.tar.xz) = 1905256
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- plugins/scintilla/scintilla/Makefile.in.orig 2014-09-05 15:15:26 UTC
|
||||
+++ plugins/scintilla/scintilla/Makefile.in
|
||||
@@ -85,7 +85,7 @@
|
||||
test_scintilla_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
|
||||
$(test_scintilla_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
|
||||
- $(LDFLAGS) -o $@
|
||||
+ $(LDFLAGS) -lgmodule-2.0 -o $@
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@ -0,0 +1,11 @@
|
||||
--- plugins/scintilla/scintilla/src/SplitVector.h.orig 2015-06-10 20:14:00.051095000 -0400
|
||||
+++ plugins/scintilla/scintilla/src/SplitVector.h 2015-06-10 20:20:33.371490000 -0400
|
||||
@@ -9,6 +9,8 @@
|
||||
#ifndef SPLITVECTOR_H
|
||||
#define SPLITVECTOR_H
|
||||
|
||||
+#include <algorithm>
|
||||
+
|
||||
template <typename T>
|
||||
class SplitVector {
|
||||
protected:
|
||||
@ -2,36 +2,27 @@ lib/anjuta/anjuta-editor.plugin
|
||||
lib/anjuta/anjuta-sample.plugin
|
||||
lib/anjuta/anjuta-scratchbox.plugin
|
||||
lib/anjuta/libanjuta-editor.a
|
||||
lib/anjuta/libanjuta-editor.la
|
||||
lib/anjuta/libanjuta-editor.so
|
||||
lib/anjuta/libanjuta-profiler.a
|
||||
lib/anjuta/libanjuta-profiler.la
|
||||
lib/anjuta/libanjuta-profiler.so
|
||||
lib/anjuta/libanjuta-sample.a
|
||||
lib/anjuta/libanjuta-sample.la
|
||||
lib/anjuta/libanjuta-sample.so
|
||||
lib/anjuta/libanjuta-scratchbox.a
|
||||
lib/anjuta/libanjuta-scratchbox.la
|
||||
lib/anjuta/libanjuta-scratchbox.so
|
||||
lib/anjuta/profiler.plugin
|
||||
share/anjuta/glade/anjuta-editor-scintilla.ui
|
||||
share/anjuta/glade/anjuta-scratchbox-panel.png
|
||||
share/anjuta/glade/anjuta-scratchbox.ui
|
||||
share/anjuta/glade/profiler-call-graph.ui
|
||||
share/anjuta/glade/profiler-flat-profile.ui
|
||||
share/anjuta/glade/profiler-function-call-tree.ui
|
||||
share/anjuta/glade/profiler.ui
|
||||
share/anjuta/properties/anjuta.properties
|
||||
share/anjuta/properties/styles.properties
|
||||
share/anjuta/properties/user.properties
|
||||
share/anjuta/ui/anjuta-sample.ui
|
||||
share/anjuta/ui/profiler.xml
|
||||
share/anjuta/ui/anjuta-scintilla.xml
|
||||
share/help/C/anjuta-manual/scintilla-plugin.page
|
||||
share/help/de/anjuta-manual/scintilla-plugin.page
|
||||
share/locale/ar/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/az/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/be/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/be@latin/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/bg/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/ca/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/ca@valencia/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/cs/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/da/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/de/LC_MESSAGES/anjuta-extras.mo
|
||||
@ -39,6 +30,7 @@ share/locale/dz/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/el/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/en_CA/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/en_GB/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/eo/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/es/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/eu/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/fi/LC_MESSAGES/anjuta-extras.mo
|
||||
@ -70,6 +62,7 @@ share/locale/pa/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/pl/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/pt/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/ro/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/ru/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/rw/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/si/LC_MESSAGES/anjuta-extras.mo
|
||||
@ -89,8 +82,6 @@ share/locale/zh_HK/LC_MESSAGES/anjuta-extras.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/anjuta-extras.mo
|
||||
share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png
|
||||
share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg
|
||||
share/pixmaps/anjuta/anjuta-profiler-plugin-48.png
|
||||
share/pixmaps/anjuta/anjuta-profiler-plugin.svg
|
||||
share/pixmaps/anjuta/anjuta-sample-plugin-48.png
|
||||
share/pixmaps/anjuta/anjuta-sample-plugin.svg
|
||||
share/pixmaps/anjuta/anjuta-scratchbox-48.png
|
||||
|
||||
@ -1,71 +1,81 @@
|
||||
# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/devel/anjuta/Makefile,v 1.72 2012/12/13 20:33:05 kwm Exp $
|
||||
|
||||
PORTNAME= anjuta
|
||||
PORTVERSION= 2.32.1.1
|
||||
PORTREVISION= 15
|
||||
PORTVERSION= 3.14.1
|
||||
CATEGORIES= devel gnome
|
||||
MASTER_SITES= GNOME
|
||||
DIST_SUBDIR= gnome2
|
||||
DIST_SUBDIR= gnome3
|
||||
|
||||
MAINTAINER= gnome@FreeBSD.org
|
||||
COMMENT= Integrated Development Environment for C and C++
|
||||
|
||||
BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \
|
||||
bash:${PORTSDIR}/shells/bash \
|
||||
p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext
|
||||
LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \
|
||||
libgladeui-1.so:${PORTSDIR}/devel/glade3 \
|
||||
libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
|
||||
libgdl-1.so:${PORTSDIR}/x11-toolkits/gdl
|
||||
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
|
||||
itstool:${PORTSDIR}/textproc/itstool
|
||||
LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \
|
||||
libgdl-3.so:${PORTSDIR}/x11-toolkits/gdl
|
||||
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
|
||||
autogen:${PORTSDIR}/devel/autogen \
|
||||
${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools \
|
||||
p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
|
||||
${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
|
||||
exctags:${PORTSDIR}/devel/ctags \
|
||||
gdb66:${PORTSDIR}/devel/gdb66 \
|
||||
yelp:${PORTSDIR}/x11/yelp
|
||||
automake>=0:${PORTSDIR}/devel/automake \
|
||||
autoconf>=0:${PORTSDIR}/devel/autoconf \
|
||||
libtool>=2.4:${PORTSDIR}/devel/libtool \
|
||||
gdb>=7.3:${PORTSDIR}/devel/gdb \
|
||||
gmake:${PORTSDIR}/devel/gmake \
|
||||
yelp>=3.0.0:${PORTSDIR}/x11/yelp
|
||||
|
||||
CONFLICTS= anjuta-3.[0-9]*
|
||||
IGNORE= Needs update after gnome 3 import
|
||||
USES= bison desktop-file-utils gettext gmake libtool pathfix \
|
||||
perl5 pkgconfig python shared-mime-info shebangfix tar:xz
|
||||
SHEBANG_FILES= plugins/project-wizard/templates/js_minimal/src/main.js \
|
||||
plugins/tools/scripts/find-fixmes.pl \
|
||||
plugins/tools/scripts/translation-status.pl \
|
||||
plugins/tools/scripts/prepare-changelog.pl
|
||||
SHEBANG_LANG+= gjs
|
||||
gjs_OLD_CMD= /usr/bin/gjs
|
||||
gjs_CMD= ${LOCALBASE}/bin/gjs
|
||||
|
||||
USES= desktop-file-utils gmake gettext libtool pathfix \
|
||||
perl5 pkgconfig python shared-mime-info shebangfix tar:bzip2
|
||||
INSTALLS_OMF= yes
|
||||
INSTALLS_ICONS= yes
|
||||
INSTALL_TARGET= install-strip
|
||||
USE_GNOME= gnomeprefix vte gtksourceview2 libgda4
|
||||
USE_CSTD= gnu89
|
||||
USE_LDCONFIG= yes
|
||||
USE_GNOME= gtksourceview3 intlhack libgda5 libwnck3 vte3
|
||||
GNU_CONFIGURE= yes
|
||||
USE_LDCONFIG= yes
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
CONFIGURE_ARGS= --with-symbol-db-shm=/tmp \
|
||||
--disable-vala \
|
||||
--disable-graphviz \
|
||||
--enable-introspection=no
|
||||
USE_LDCONFIG= yes
|
||||
GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \
|
||||
anjuta-cvs-plugin.schemas \
|
||||
anjuta-debug-manager.schemas \
|
||||
anjuta-document-manager.schemas \
|
||||
anjuta-editor-sourceview.schemas \
|
||||
anjuta-language-cpp-java.schemas \
|
||||
anjuta-message-manager-plugin.schemas \
|
||||
anjuta-symbol-db.schemas \
|
||||
anjuta-terminal-plugin.schemas \
|
||||
file-manager.schemas \
|
||||
preferences.schemas \
|
||||
python-plugin-properties.schemas
|
||||
SHEBANG_FILES= scripts/builder2schema.pl \
|
||||
plugins/gbf-am/gbf-am-parse.in \
|
||||
plugins/gbf-mkfile/gbf-mkfile-parse.in \
|
||||
plugins/tools/scripts/*.pl
|
||||
--disable-packagekit \
|
||||
--enable-compile-warnings=minimum \
|
||||
--enable-introspection=yes
|
||||
DOCSDIR= share/doc/libanjuta
|
||||
INSTALL_TARGET= install-strip
|
||||
|
||||
OPTIONS_DEFINE= SVN DEVHELP DOCS
|
||||
OPTIONS_DEFAULT=DEVHELP
|
||||
DEVHELP_DESC= Devhelp support
|
||||
GLIB_SCHEMAS= org.gnome.anjuta.cvs.gschema.xml \
|
||||
org.gnome.anjuta.document-manager.gschema.xml \
|
||||
org.gnome.anjuta.file-manager.gschema.xml \
|
||||
org.gnome.anjuta.gschema.xml \
|
||||
org.gnome.anjuta.plugins.build.gschema.xml \
|
||||
org.gnome.anjuta.plugins.cpp.gschema.xml \
|
||||
org.gnome.anjuta.plugins.debug-manager.gschema.xml \
|
||||
org.gnome.anjuta.plugins.git.gschema.xml \
|
||||
org.gnome.anjuta.plugins.indent-c.gschema.xml \
|
||||
org.gnome.anjuta.plugins.indent-python.gschema.xml \
|
||||
org.gnome.anjuta.plugins.js.gschema.xml \
|
||||
org.gnome.anjuta.plugins.message-manager.gschema.xml \
|
||||
org.gnome.anjuta.plugins.parser-cxx.gschema.xml \
|
||||
org.gnome.anjuta.plugins.project-wizard.gschema.xml \
|
||||
org.gnome.anjuta.plugins.python.gschema.xml \
|
||||
org.gnome.anjuta.plugins.run.gschema.xml \
|
||||
org.gnome.anjuta.plugins.sourceview.gschema.xml \
|
||||
org.gnome.anjuta.plugins.vala.gschema.xml \
|
||||
org.gnome.anjuta.snippets.gschema.xml \
|
||||
org.gnome.anjuta.starter.gschema.xml \
|
||||
org.gnome.anjuta.symbol-db.gschema.xml \
|
||||
org.gnome.anjuta.terminal.gschema.xml \
|
||||
org.gnome.anjuta.tools.gschema.xml
|
||||
|
||||
OPTIONS_DEFINE= SVN DEVHELP VALA
|
||||
OPTIONS_DEFAULT=SVN DEVHELP VALA
|
||||
SVN_DESC= Subversion plugin
|
||||
DEVHELP_DESC= Devhelp plugin
|
||||
VALA_DESC= Vala support
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
@ -81,7 +91,7 @@ PLIST_SUB+= SVN="@comment "
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MDEVHELP}
|
||||
LIB_DEPENDS+= libdevhelp-2.so:${PORTSDIR}/devel/devhelp
|
||||
LIB_DEPENDS+= libdevhelp-3.so:${PORTSDIR}/devel/devhelp
|
||||
PLIST_SUB+= DEVHELP=""
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-plugin-devhelp
|
||||
@ -91,21 +101,28 @@ CONFIGURE_ARGS+=--disable-plugin-devhelp
|
||||
PLIST_SUB+= DEVHELP=""
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${RM} ${WRKSRC}/plugins/debug-manager/anjuta-debug-manager.schemas
|
||||
.if ${PORT_OPTIONS:MVALA}
|
||||
CONFIGURE_ARGS+=--enable-vala
|
||||
BUILD_DEPENDS+= vala>=0.14.0:${PORTSDIR}/lang/vala
|
||||
RUN_DEPENDS+= vala>=0.14.0:${PORTSDIR}/lang/vala
|
||||
PLIST_SUB+= VALA=""
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-vala
|
||||
PLIST_SUB+= VALA="@comment "
|
||||
.endif
|
||||
|
||||
post-configure:
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|"make|"gmake|g' \
|
||||
${WRKSRC}/plugins/build-basic-autotools/plugin.c
|
||||
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
|
||||
${WRKSRC}/plugins/symbol-db/plugin.h \
|
||||
${WRKSRC}/plugins/symbol-db/symbol-db-prefs.h
|
||||
|
||||
post-install:
|
||||
@${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
.for f in AUTHORS COPYING ChangeLog FUTURE INSTALL NEWS README \
|
||||
doc/ScintillaDoc.html TODO
|
||||
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
|
||||
.endfor
|
||||
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
|
||||
${WRKSRC}/libanjuta/anjuta-utils.c
|
||||
@${REINPLACE_CMD} -e 's|ac_ct_CXX" = "x"|CXX" = "x"|g' \
|
||||
${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e 's|values.h|limits.h|g' \
|
||||
${WRKSRC}/plugins/project-wizard/property.h \
|
||||
${WRKSRC}/plugins/project-wizard/install.h
|
||||
@${REINPLACE_CMD} -e 's|-fprofile-arcs||g' \
|
||||
${WRKSRC}/libanjuta/tests/Makefile.in \
|
||||
${WRKSRC}/libanjuta/tests/Makefile.am
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (gnome2/anjuta-2.32.1.1.tar.bz2) = f2b67609890a45d907ab5b42fd5963ba7cb41193d4a0dd2543584eca2ec5db58
|
||||
SIZE (gnome2/anjuta-2.32.1.1.tar.bz2) = 10171972
|
||||
SHA256 (gnome3/anjuta-3.14.1.tar.xz) = b26cd75ddb603c3cca4348e277d17360e511d75bd77ee2ef52047b75408e617b
|
||||
SIZE (gnome3/anjuta-3.14.1.tar.xz) = 6310008
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
--- Makefile.in.orig 2009-12-23 12:28:03.000000000 +0100
|
||||
+++ Makefile.in 2009-12-23 12:31:34.000000000 +0100
|
||||
@@ -490,17 +490,17 @@ uninstall-anjuta_dataDATA:
|
||||
echo " ( cd '$(DESTDIR)$(anjuta_datadir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(anjuta_datadir)" && rm -f $$files
|
||||
install-anjutadocDATA: $(anjutadoc_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)"
|
||||
- @list='$(anjutadoc_DATA)'; test -n "$(anjutadocdir)" || list=; \
|
||||
- for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- echo "$$d$$p"; \
|
||||
- done | $(am__base_list) | \
|
||||
- while read files; do \
|
||||
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(anjutadocdir)'"; \
|
||||
- $(INSTALL_DATA) $$files "$(DESTDIR)$(anjutadocdir)" || exit $$?; \
|
||||
- done
|
||||
+# @$(NORMAL_INSTALL)
|
||||
+# test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)"
|
||||
+# @list='$(anjutadoc_DATA)'; test -n "$(anjutadocdir)" || list=; \
|
||||
+# for p in $$list; do \
|
||||
+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
+# echo "$$d$$p"; \
|
||||
+# done | $(am__base_list) | \
|
||||
+# while read files; do \
|
||||
+# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(anjutadocdir)'"; \
|
||||
+# $(INSTALL_DATA) $$files "$(DESTDIR)$(anjutadocdir)" || exit $$?; \
|
||||
+# done
|
||||
|
||||
uninstall-anjutadocDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@ -1,11 +0,0 @@
|
||||
--- doc/Makefile.in.orig 2008-08-06 17:40:26.000000000 +0200
|
||||
+++ doc/Makefile.in 2008-08-06 17:41:04.000000000 +0200
|
||||
@@ -540,7 +540,7 @@
|
||||
|
||||
info-am:
|
||||
|
||||
-install-data-am: install-anjuta_docDATA install-man
|
||||
+install-data-am: install-man
|
||||
|
||||
install-dvi: install-dvi-am
|
||||
|
||||
11
devel/anjuta/files/patch-libanjuta_Makefile.in
Normal file
11
devel/anjuta/files/patch-libanjuta_Makefile.in
Normal file
@ -0,0 +1,11 @@
|
||||
--- libanjuta/Makefile.in.orig 2015-06-10 15:59:14.005088000 -0400
|
||||
+++ libanjuta/Makefile.in 2015-06-10 15:59:28.001860000 -0400
|
||||
@@ -688,7 +688,7 @@
|
||||
interfaces/libanjuta-iface-marshallers.h\
|
||||
interfaces/libanjuta-interfaces.h
|
||||
|
||||
-SUBDIRS = interfaces . tests
|
||||
+SUBDIRS = interfaces .
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I . \
|
||||
@ -1,5 +1,5 @@
|
||||
--- libanjuta/anjuta-launcher.c.orig 2009-03-18 04:24:10.000000000 -0400
|
||||
+++ libanjuta/anjuta-launcher.c 2009-04-16 19:49:25.000000000 -0400
|
||||
--- libanjuta/anjuta-launcher.c.orig 2011-06-11 10:39:57.000000000 +0200
|
||||
+++ libanjuta/anjuta-launcher.c 2011-06-11 10:46:22.000000000 +0200
|
||||
@@ -761,7 +761,8 @@ anjuta_launcher_scan_output (GIOChannel
|
||||
GError *err = NULL;
|
||||
do
|
||||
@ -10,7 +10,7 @@
|
||||
if (n > 0) /* There is output */
|
||||
{
|
||||
gchar *utf8_chars = NULL;
|
||||
@@ -789,6 +790,15 @@ anjuta_launcher_scan_output (GIOChannel
|
||||
@@ -789,6 +790,14 @@ anjuta_launcher_scan_output (GIOChannel
|
||||
anjuta_launcher_synchronize (launcher);
|
||||
ret = FALSE;
|
||||
}
|
||||
@ -22,11 +22,10 @@
|
||||
+ g_error_free (err);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
/* Read next chars if buffer was too small
|
||||
* (the maximum length of one character is 6 bytes) */
|
||||
} while (!err && (n > FILE_BUFFER_SIZE - 7));
|
||||
@@ -818,7 +828,8 @@ anjuta_launcher_scan_error (GIOChannel *
|
||||
@@ -818,7 +827,8 @@ anjuta_launcher_scan_error (GIOChannel *
|
||||
GError *err = NULL;
|
||||
do
|
||||
{
|
||||
@ -36,7 +35,7 @@
|
||||
if (n > 0) /* There is stderr output */
|
||||
{
|
||||
gchar *utf8_chars;
|
||||
@@ -844,6 +855,15 @@ anjuta_launcher_scan_error (GIOChannel *
|
||||
@@ -844,6 +854,14 @@ anjuta_launcher_scan_error (GIOChannel *
|
||||
anjuta_launcher_synchronize (launcher);
|
||||
ret = FALSE;
|
||||
}
|
||||
@ -48,11 +47,10 @@
|
||||
+ g_error_free (err);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
/* Read next chars if buffer was too small
|
||||
* (the maximum length of one character is 6 bytes) */
|
||||
} while (!err && (n > FILE_BUFFER_SIZE - 7));
|
||||
@@ -873,7 +893,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch
|
||||
@@ -873,7 +891,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch
|
||||
GError *err = NULL;
|
||||
do
|
||||
{
|
||||
@ -62,7 +60,7 @@
|
||||
if (n > 0) /* There is stderr output */
|
||||
{
|
||||
gchar *utf8_chars;
|
||||
@@ -902,6 +923,11 @@ anjuta_launcher_scan_pty (GIOChannel *ch
|
||||
@@ -902,6 +921,11 @@ anjuta_launcher_scan_pty (GIOChannel *ch
|
||||
{
|
||||
ret = FALSE;
|
||||
}
|
||||
|
||||
13
devel/anjuta/files/patch-libanjuta_anjuta-utils.c
Normal file
13
devel/anjuta/files/patch-libanjuta_anjuta-utils.c
Normal file
@ -0,0 +1,13 @@
|
||||
--- libanjuta/anjuta-utils.c.orig 2012-06-16 20:02:59.000000000 +0200
|
||||
+++ libanjuta/anjuta-utils.c 2012-06-16 20:04:17.000000000 +0200
|
||||
@@ -1060,8 +1060,8 @@
|
||||
const gchar shells [][14] = {
|
||||
/* Note that on some systems shells can also
|
||||
* be installed in /usr/bin */
|
||||
- "/bin/bash", "/usr/bin/bash",
|
||||
- "/bin/zsh", "/usr/bin/zsh",
|
||||
+ "/bin/bash", "/usr/bin/bash", "%%LOCALBASE%%/bin/bash",
|
||||
+ "/bin/zsh", "/usr/bin/zsh", "%%LOCALBASE%%/bin/zsh",
|
||||
"/bin/tcsh", "/usr/bin/tcsh",
|
||||
"/bin/ksh", "/usr/bin/ksh",
|
||||
"/bin/csh", "/bin/sh"
|
||||
@ -1,11 +1,11 @@
|
||||
--- plugins/gdb/debugger.c.orig 2010-07-25 22:27:28.000000000 +0200
|
||||
+++ plugins/gdb/debugger.c 2010-09-01 12:00:35.000000000 +0200
|
||||
--- plugins/gdb/debugger.c.orig 2011-10-19 09:20:26.000000000 +0200
|
||||
+++ plugins/gdb/debugger.c 2012-04-27 16:36:39.000000000 +0200
|
||||
@@ -56,7 +56,7 @@
|
||||
|
||||
#define GDB_PROMPT "(gdb)"
|
||||
#define FILE_BUFFER_SIZE 1024
|
||||
-#define GDB_PATH "gdb"
|
||||
+#define GDB_PATH "gdb66"
|
||||
+#define GDB_PATH "/usr/local/bin/gdb"
|
||||
#define MAX_CHILDREN 25 /* Limit the number of variable children
|
||||
* returned by debugger */
|
||||
#define SUMMARY_MAX_LENGTH 90 /* Should be smaller than 4K to be displayed
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
--- plugins/symbol-db/symbol-db-engine-core.c.orig 2009-08-27 09:17:03.000000000 +0200
|
||||
+++ plugins/symbol-db/symbol-db-engine-core.c 2009-08-27 17:32:35.000000000 +0200
|
||||
@@ -1504,7 +1504,7 @@ sdb_engine_ctags_output_thread (gpointer
|
||||
--- plugins/symbol-db/symbol-db-engine-core.c.orig 2011-06-11 10:48:41.000000000 +0200
|
||||
+++ plugins/symbol-db/symbol-db-engine-core.c 2011-06-11 10:52:40.000000000 +0200
|
||||
@@ -1072,7 +1072,7 @@ sdb_engine_ctags_output_thread (gpointer
|
||||
|
||||
/* found out a new marker */
|
||||
marker_ptr = strstr (marker_ptr + len_marker, CTAGS_MARKER);
|
||||
- } while (remaining_chars + len_marker < len_chars || marker_ptr != NULL);
|
||||
+ } while (remaining_chars > 0 || marker_ptr != NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1831,8 +1831,8 @@ sdb_engine_scan_files_1 (SymbolDBEngine
|
||||
|
||||
SDB_UNLOCK(priv);
|
||||
@@ -1488,8 +1488,8 @@ sdb_engine_scan_files_1 (SymbolDBEngine
|
||||
gint i = 0;
|
||||
while (TRUE)
|
||||
{
|
||||
@ -20,7 +20,7 @@
|
||||
gchar *test;
|
||||
test = g_strconcat (SHARED_MEMORY_PREFIX, temp_file, NULL);
|
||||
if (g_file_test (test, G_FILE_TEST_EXISTS) == TRUE)
|
||||
@@ -1852,12 +1852,12 @@ sdb_engine_scan_files_1 (SymbolDBEngine
|
||||
@@ -1509,7 +1509,7 @@ sdb_engine_scan_files_1 (SymbolDBEngine
|
||||
priv->shared_mem_str = temp_file;
|
||||
|
||||
if ((priv->shared_mem_fd =
|
||||
@ -29,13 +29,7 @@
|
||||
{
|
||||
g_warning ("Error while trying to open a shared memory file. Be"
|
||||
"sure to have "SHARED_MEMORY_PREFIX" mounted with tmpfs");
|
||||
}
|
||||
-
|
||||
+
|
||||
priv->shared_mem_file = fdopen (priv->shared_mem_fd, "a+b");
|
||||
/*DEBUG_PRINT ("temp_file %s", temp_file);*/
|
||||
|
||||
@@ -2446,7 +2446,7 @@ sdb_engine_init (SymbolDBEngine * object
|
||||
@@ -2010,7 +2010,7 @@ sdb_engine_init (SymbolDBEngine * object
|
||||
static void
|
||||
sdb_engine_unlink_shared_files (gpointer key, gpointer value, gpointer user_data)
|
||||
{
|
||||
@ -44,7 +38,7 @@
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -2535,7 +2535,7 @@ sdb_engine_finalize (GObject * object)
|
||||
@@ -2103,7 +2103,7 @@ sdb_engine_finalize (GObject * object)
|
||||
|
||||
if (priv->shared_mem_str)
|
||||
{
|
||||
@ -53,7 +47,7 @@
|
||||
g_free (priv->shared_mem_str);
|
||||
priv->shared_mem_str = NULL;
|
||||
}
|
||||
@@ -6059,12 +6059,12 @@ symbol_db_engine_update_buffer_symbols (
|
||||
@@ -5494,12 +5494,12 @@ symbol_db_engine_update_buffer_symbols (
|
||||
* target buffer one */
|
||||
base_filename = g_filename_display_basename (relative_path);
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- plugins/symbol-db/symbol-db-prefs.h.orig 2009-07-27 16:14:31.000000000 +0200
|
||||
+++ plugins/symbol-db/symbol-db-prefs.h 2009-07-28 00:10:49.000000000 +0200
|
||||
@@ -41,7 +41,7 @@ typedef struct _SymbolDBPrefsPriv Symbol
|
||||
|
||||
|
||||
/*
|
||||
-#define CTAGS_PREFS "preferences_entry:text:/usr/bin/ctags:0:symboldb.ctags"
|
||||
+#define CTAGS_PREFS "preferences_entry:text:%%LOCALBASE%%/bin/ctags:0:symboldb.ctags"
|
||||
#define CTAGS_PREFS_KEY "symboldb.ctags"
|
||||
*/
|
||||
#define PROJECT_AUTOSCAN "symboldb.scan_prj_pkgs"
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user