Date: 17 Jun 2003 19:05:47 +0400 From: Sergey Akifyev <asa@gascom.ru> To: Joe Marcus Clarke <marcus@marcuscom.com> Cc: FreeBSD GNOME Users <gnome@freebsd.org> Subject: [PATCH] anjuta-devel update Message-ID: <1055862346.333.34.camel@asa.gascom.net.ru>
next in thread | raw e-mail | index | archive | help
--=-aDMlR1IJuwXSzNfBJaxM Content-Type: multipart/mixed; boundary="=-dRo2gsFZffzrR9qZ8Yq5" --=-dRo2gsFZffzrR9qZ8Yq5 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello, dear All! I've made anjuta-devel and scintilla patches so, than it now uses system scintilla. Scintilla is also updated to 1.53. With newer system scintilla anjuta-1.1.1 works _very_ stable, but font antialiasing in editor window is gone. I think scintilla update must be committed anyway with possible empty neighbour port like scintilla-gtk2. --=20 regards, Sergey Akifyev <asa@gascom.ru> JSC Gascom <http://www.gascom.ru>; PGP key available from: ftp://ftp.gascom.ru/pub/PGP-keys/asa.txt --=-dRo2gsFZffzrR9qZ8Yq5 Content-Disposition: attachment; filename=anjuta-devel.diff Content-Type: text/x-patch; name=anjuta-devel.diff; charset=KOI8-R Content-Transfer-Encoding: quoted-printable diff -ruN anjuta-devel.orig/Makefile anjuta-devel/Makefile --- anjuta-devel.orig/Makefile Tue Jun 17 17:54:19 2003 +++ anjuta-devel/Makefile Tue Jun 17 18:41:25 2003 @@ -15,7 +15,9 @@ MAINTAINER=3D gnome@FreeBSD.org COMMENT=3D Integrated Development Environment for C and C++ =20 -LIB_DEPENDS=3D pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS=3D pcre.0:${PORTSDIR}/devel/pcre \ + scintilla.1:${PORTSDIR}/x11-toolkits/scintilla +DEPENDS_ARGS=3D SCINTILLA_GTK2=3Dyes =20 NO_LATEST_LINK=3D yes USE_X_PREFIX=3D yes @@ -33,8 +35,7 @@ ${PREFIX}/share/gnome/anjuta/glade .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} -.for f in AUTHORS COPYING ChangeLog FUTURE INSTALL NEWS README \ - doc/ScintillaDoc.html TODO +.for f in AUTHORS COPYING ChangeLog FUTURE INSTALL NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif diff -ruN anjuta-devel.orig/files/patch-Makefile.in anjuta-devel/files/patc= h-Makefile.in --- anjuta-devel.orig/files/patch-Makefile.in Tue Jun 17 17:54:19 2003 +++ anjuta-devel/files/patch-Makefile.in Tue Jun 17 17:56:31 2003 @@ -1,5 +1,14 @@ ---- Makefile.in.orig Wed May 14 13:01:45 2003 -+++ Makefile.in Wed May 14 13:02:02 2003 +--- Makefile.in.orig Tue Jun 17 17:55:36 2003 ++++ Makefile.in Tue Jun 17 17:56:04 2003 +@@ -157,7 +157,7 @@ + VTE_REQUIRED =3D @VTE_REQUIRED@ + ZVT_REQUIRED =3D @ZVT_REQUIRED@ +=20 +-SUBDIRS =3D po tagmanager global-tags scintilla \ ++SUBDIRS =3D po tagmanager global-tags \ + gdl widgets printing pixmaps scripts data \ + doc launcher plugins src +=20 @@ -281,17 +281,17 @@ done =20 diff -ruN anjuta-devel.orig/files/patch-src-Makefile.in anjuta-devel/files/= patch-src-Makefile.in --- anjuta-devel.orig/files/patch-src-Makefile.in Thu Jan 1 03:00:00 1970 +++ anjuta-devel/files/patch-src-Makefile.in Tue Jun 17 18:39:52 2003 @@ -0,0 +1,41 @@ +--- src/Makefile.in.orig Tue Jun 17 18:26:30 2003 ++++ src/Makefile.in Tue Jun 17 18:33:50 2003 +@@ -173,7 +173,7 @@ + # -DGDK_PIXBUF_DEPRECATED \ + # -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED +=20 +-SCILEXERS =3D \ ++SCILEXERS_DISABLED =3D \ + ../scintilla/StyleContext.o\ + ../scintilla/LexCPP.o\ + ../scintilla/LexConf.o\ +@@ -395,7 +395,7 @@ + anjuta_LDADD =3D \ + $(ANJUTA_LIBS) \ + $(PCRE_LIBS)\ +- $(top_builddir)/scintilla/libscintilla.a\ ++ -lscintilla -lscintilla_lexers \ + $(top_builddir)/tagmanager/libctags.a\ + $(top_builddir)/widgets/libwidgets.a\ + $(top_builddir)/gdl/libgdl.a\ +@@ -450,18 +450,10 @@ + compatibility_0.$(OBJEXT) defaults.$(OBJEXT) resources.$(OBJEXT) \ + session.$(OBJEXT) start-with.$(OBJEXT) style-editor.$(OBJEXT) \ + widget-registry.$(OBJEXT) +-anjuta_DEPENDENCIES =3D $(top_builddir)/scintilla/libscintilla.a \ ++anjuta_DEPENDENCIES =3D \ + $(top_builddir)/tagmanager/libctags.a \ + $(top_builddir)/widgets/libwidgets.a $(top_builddir)/gdl/libgdl.a \ +-$(top_builddir)/printing/libanjutaprint.a ../scintilla/StyleContext.o \ +-../scintilla/LexCPP.o ../scintilla/LexConf.o ../scintilla/LexHTML.o \ +-../scintilla/LexLua.o ../scintilla/LexOthers.o ../scintilla/LexPerl.o \ +-../scintilla/LexPython.o ../scintilla/LexSQL.o ../scintilla/LexVB.o \ +-../scintilla/LexPascal.o ../scintilla/LexAVE.o \ +-../scintilla/LexCrontab.o ../scintilla/LexEiffel.o \ +-../scintilla/LexLisp.o ../scintilla/LexRuby.o ../scintilla/LexBullant.o \ +-../scintilla/LexAda.o ../scintilla/LexBaan.o ../scintilla/LexMatlab.o \ +-../scintilla/LexAsm.o ../scintilla/LexFortran.o ../scintilla/LexCSS.o ++$(top_builddir)/printing/libanjutaprint.a + anjuta_LDFLAGS =3D=20 + CXXFLAGS =3D @CXXFLAGS@ + CXXCOMPILE =3D $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM= _CXXFLAGS) $(CXXFLAGS) --=-dRo2gsFZffzrR9qZ8Yq5 Content-Disposition: attachment; filename=scintilla.diff Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; name=scintilla.diff; charset=KOI8-R diff -ruN scintilla.orig/Makefile scintilla/Makefile --- scintilla.orig/Makefile Tue Jun 17 17:11:04 2003 +++ scintilla/Makefile Tue Jun 17 17:52:42 2003 @@ -6,7 +6,7 @@ # =20 PORTNAME=3D scintilla -PORTVERSION=3D 1.51 +PORTVERSION=3D 1.53 CATEGORIES=3D x11-toolkits MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE} \ http://www.scintilla.org/ @@ -21,7 +21,13 @@ =20 USE_X_PREFIX=3D yes USE_GMAKE=3D yes +.ifdef(SCINTILLA_GTK2) +USE_GNOME=3D gtk20 +MAKE_ENV=3D GTK2=3D1 +PKGNAMESUFFIX=3D -gtk2 +.else USE_GNOME=3D gtk12 +.endif INSTALLS_SHLIB=3D yes MAKEFILE=3D makefile =20 diff -ruN scintilla.orig/distinfo scintilla/distinfo --- scintilla.orig/distinfo Tue Jun 17 17:11:04 2003 +++ scintilla/distinfo Tue Jun 17 17:13:42 2003 @@ -1 +1 @@ -MD5 (scite151.tgz) =3D 71439397367fae2bd92b74f63144e74f +MD5 (scite153.tgz) =3D 156275ae6318c323b308f403033663cd diff -ruN scintilla.orig/files/patch-PlatGTK.cxx scintilla/files/patch-Plat= GTK.cxx --- scintilla.orig/files/patch-PlatGTK.cxx Thu Jan 1 03:00:00 1970 +++ scintilla/files/patch-PlatGTK.cxx Tue Jun 17 17:44:03 2003 @@ -0,0 +1,11 @@ +--- PlatGTK.cxx.orig Tue Jun 17 17:41:00 2003 ++++ PlatGTK.cxx Tue Jun 17 17:44:00 2003 +@@ -1034,7 +1034,7 @@ + static char *UTF8FromIconv(iconv_t iconvh, const char *s, int len) { + if (iconvh !=3D ((iconv_t)(-1))) { + char *utfForm =3D new char[len*3+1]; +- char *pin =3D const_cast<char *>(s); ++ const char *pin =3D s; + size_t inLeft =3D len; + char *pout =3D utfForm; + size_t outLeft =3D len*3+1; diff -ruN scintilla.orig/files/patch-ScintillaGTK.cxx scintilla/files/patch= -ScintillaGTK.cxx --- scintilla.orig/files/patch-ScintillaGTK.cxx Thu Jan 1 03:00:00 1970 +++ scintilla/files/patch-ScintillaGTK.cxx Tue Jun 17 17:46:51 2003 @@ -0,0 +1,11 @@ +--- ScintillaGTK.cxx.orig Tue Jun 17 17:45:29 2003 ++++ ScintillaGTK.cxx Tue Jun 17 17:46:13 2003 +@@ -877,7 +877,7 @@ + iconv_t iconvh =3D iconv_open("UTF8", source); + if (iconvh !=3D ((iconv_t)(-1))) { + char localeVal[4]=3D"\0\0\0"; +- char *pin =3D utfVal; ++ const char *pin =3D utfVal; + size_t inLeft =3D strlen(utfVal); + char *pout =3D localeVal; + size_t outLeft =3D sizeof(localeVal); diff -ruN scintilla.orig/files/patch-aa scintilla/files/patch-aa --- scintilla.orig/files/patch-aa Tue Jun 17 17:11:04 2003 +++ scintilla/files/patch-aa Tue Jun 17 17:39:28 2003 @@ -24,24 +24,12 @@ =20 vpath %.h ../src ../include vpath %.cxx ../src -@@ -25,9 +26,9 @@ - CXXBASEFLAGS=3D-W -Wall -DGTK -DSCI_LEXER $(INCLUDEDIRS) -=20 - ifdef DEBUG --CXXFLAGS=3D-DDEBUG -g $(CXXBASEFLAGS) -+CXXFLAGS+=3D-DDEBUG -g $(CXXBASEFLAGS) - else --CXXFLAGS=3D-DNDEBUG -Os $(CXXBASEFLAGS) -+CXXFLAGS+=3D-DNDEBUG $(CXXBASEFLAGS) - endif -=20 - ifdef GTK2 @@ -37,7 +38,7 @@ endif =20 .cxx.o: - $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< -+ $(CC) -DPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $< ++ $(CC) -DPIC -fpic $(shell $(CONFIGFLAGS)) $(CXXFLAGS) -c $< =20 #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=3D\\\n\(\*.o \) --=-dRo2gsFZffzrR9qZ8Yq5-- --=-aDMlR1IJuwXSzNfBJaxM Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (FreeBSD) iD8DBQA+7y5Kbu06QwmNwNsRAlIWAJ40r4jh+nuPDCW9q9qOHHJ/whc5TwCeNEOk cuso8TYJujsNMTJtYWRLWKw= =t/O9 -----END PGP SIGNATURE----- --=-aDMlR1IJuwXSzNfBJaxM--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1055862346.333.34.camel>