Date: 17 Jun 2003 19:30:55 +0400 From: Sergey Akifyev <asa@gascom.ru> To: Joe Marcus Clarke <marcus@marcuscom.com> Cc: FreeBSD GNOME Users <gnome@freebsd.org> Subject: Re: [PATCH] anjuta-devel update Message-ID: <1055863854.333.36.camel@asa.gascom.net.ru> In-Reply-To: <1055862346.333.34.camel@asa.gascom.net.ru> References: <1055862346.333.34.camel@asa.gascom.net.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-H1ZHMWpe9zRiGMyFTZML Content-Type: multipart/mixed; boundary="=-/+UpMb1LFocy25COxhBm" --=-/+UpMb1LFocy25COxhBm Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Tue, 2003-06-17 at 19:05, Sergey Akifyev wrote: > I've made anjuta-devel and scintilla patches so, than it now uses system Ooops! Wrong scintilla diff included! Fixing... --=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 --=-/+UpMb1LFocy25COxhBm 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 19:23:49 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 \) @@ -60,10 +48,10 @@ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o - $(AR) rc $@ $^ - $(RANLIB) $@ -+ $(AR) $(shell $(GTK_CONFIG) --libs gthread) -o $@ $^ ++ $(AR) $(shell $(CONFIGFLAGS) --libs) -o $@ $^ + + $(LEXRLIB): $(LEXOBJS) -+ $(AR) $(shell $(GTK_CONFIG) --libs gthread) -o $@ $^ ++ $(AR) $(shell $(CONFIGFLAGS) --libs) -o $@ $^ =20 # Automatically generate header dependencies with "make deps" include deps.mak --=-/+UpMb1LFocy25COxhBm-- --=-H1ZHMWpe9zRiGMyFTZML 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+7zQubu06QwmNwNsRAi03AJoDmnSN8SmFloMEQUoivwcZhEbVGwCfZPTM gRLVnEfy9rmnTZpdenT5/RU= =T/uQ -----END PGP SIGNATURE----- --=-H1ZHMWpe9zRiGMyFTZML--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1055863854.333.36.camel>