ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74,
take maintainership
Naram Qashat
cyberbotx at cyberbotx.com
Fri Aug 10 19:50:07 UTC 2007
The following reply was made to PR ports/115127; it has been noted by GNATS.
From: "Naram Qashat" <cyberbotx at cyberbotx.com>
To: <bug-followup at freebsd.org>,
"Jeremy Messenger" <mezz7 at cox.net>
Cc:
Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74, take maintainership
Date: Fri, 10 Aug 2007 15:46:50 -0400
This is a multi-part message in MIME format.
------=_NextPart_000_0270_01C7DB65.AA880810
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
I figured out what was going on (I was manually doing each file instead of
just running diff -ruN on both directories), so I'm attaching the patch. I
tested it on the current port in /usr/ports and it applied cleanly this
time.
Thanks,
Naram Qashat
----- Original Message -----
From: "Jeremy Messenger" <mezz7 at cox.net>
To: "Naram Qashat" <cyberbotx at cyberbotx.com>; <bug-followup at freebsd.org>
Sent: Friday, August 10, 2007 2:55 PM
Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74,
take maintainership
On Fri, 10 Aug 2007 12:39:10 -0500, Naram Qashat <cyberbotx at cyberbotx.com>
wrote:
> This is (hopefully) the last patch I'll need to do to get this committed
> and
> working with the ports tree as best as possible. I took your suggestion
> to
> using the .scintilla-gtk(1|2) file in the include directory, and I
> submitted
> a patch to x11-toolkits/gtkscintilla so it'll only be allowed if
> Scintilla
> was built with GTK1. I will be submitting a new patch for editors/scite
> that checks the same thing, but for GTK2 instead.
>
> The new patch is attached.
Can you create a new patch? It doesn't apply clean:
==========================================
Patching file scintilla/files/patch-aa using Plan A...
Hunk #1 succeeded at 1 with fuzz 1.
Hunk #2 failed at 29.
Hunk #3 succeeded at 72 with fuzz 1.
1 out of 3 hunks failed--saving rejects to scintilla/files/patch-aa.rej
==========================================
Cheers,
Mezz
> Thanks,
> Naram Qashat
>
> ----- Original Message -----
> From: "Jeremy Messenger" <mezz7 at cox.net>
> To: "Naram Qashat" <cyberbotx at cyberbotx.com>; <bug-followup at freebsd.org>
> Sent: Thursday, August 09, 2007 12:37 PM
> Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to
> 1.74,
> take maintainership
>
>
>> On Thu, 09 Aug 2007 09:04:27 -0500, Naram Qashat
>> <cyberbotx at cyberbotx.com>
>> wrote:
>>
>> > I looked into it, and there's only one port
>> (x11-toolkits/gtkscintilla)
>> > that
>> > uses scintilla other than SciTE, and it is a GTK1.x wrapper, so I am
>> > putting
>> > the WITH_GTK2 knob back in. I filed a bug report regarding SciTE
>> being
>> > unable to compile with GTK1, though, so I'm waiting to here back on
> that.
>> >
>> > As an aside, what would be the best way for the editors/scite port to
>> > check
>> > if x11-toolkits/scintilla was built using GTK1 or GTK2?
>>
>> There are two different ways.
>>
>> - Add a touch of an empty file something like if it compiles with gtk1
>> then create ${PREFIX}/include/scintilla/.scintilla-gtk1 and if with gtk2
>> then create ${PREFIX}/include/scintilla/.scintilla-gtk2. The other ports
>> can check on if .scintilla-gtk(1|2) exists then mark it as IGNORE.
>>
>> - Create a slave port like x11-toolkits/scintilla-gtk2 and rename the
>> name
>> of library to libfoo-gtk2.so that way both gtk1 and gtk2 versions can be
>> install together. There will be no block for any apps to be install.
>>
>> Also, you can do something like x11-toolkits/scintilla only install
>> header files if they don't change, then create two new scintilla-gtk1
>> (without change name of file) and scintilla-gtk2 ports. To do this, you
>> will have to hack in the every ports that depend on scintilla-gtk2 (for
>> change name of libraries). If you want to do this, don't forget to tweak
>> the dependencies.
>>
>> Or you can do something like x11-toolkits/scintilla (meta-port),
>> x11-toolkits/scintilla-header (install headers),
>> x11-toolkits/scintilla-gtk1 (unchange, has gtk1 libraries) and
>> x11-toolkits/scintilla-gtk2 (change name, has gtk2 libraries). Have both
>> scintilla-gtk* depend on scintilla-header. Have scintilla depend on
>> scintilla-gtk1 by default without have to tweak other ports that depend
>> on
>> old x11-toolkits/scintilla. SciTE depends on scintilla-gtk2. You can
>> check
>> on graphics/gimp, gimp-apps and etc for example.
>>
>> There are different ways, you can play with it and find which is
>> better
>> for these ports.
>>
>> > Here's the updated patch.
>> <snip>
>>
>> I will checking your patch in another email that you have resend and I
>> can
>> commit it in this afternoon.
>>
>> Cheers,
>> Mezz
>>
>> > Naram Qashat
>> >
>> > ----- Original Message -----
>> > From: "Jeremy Messenger" <mezz7 at cox.net>
>> > To: <bug-followup at freebsd.org>; <cyberbotx at cyberbotx.com>
>> > Sent: Wednesday, August 08, 2007 9:47 PM
>> > Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to
>> > 1.74,
>> > take maintainership
>> >
>> >
>> >> There is a problem with if you switch the default of GTK. It might
> break
>> >> other ports. Althought, some of them might be safe to be remove due
>> to
>> >> out
>> >> of date or too old, so this method is simpler. If you are willing to
>> do
>> >> the more tasks and we shall reward you the maintainership.
>> >>
>> >> Cheers,
>> >> Mezz
--
mezz7 at cox.net - mezz at FreeBSD.org
FreeBSD GNOME Team - FreeBSD Multimedia Hat (ports, not src)
http://www.FreeBSD.org/gnome/ - gnome at FreeBSD.org
http://wiki.freebsd.org/multimedia - multimedia at FreeBSD.org
--
No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.5.476 / Virus Database: 269.11.11/944 - Release Date: 8/9/2007
2:44 PM
------=_NextPart_000_0270_01C7DB65.AA880810
Content-Type: application/octet-stream;
name="scintilla.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="scintilla.diff"
diff -ruN --exclude=3DCVS /usr/ports/x11-toolkits/scintilla/Makefile =
/kirby/shared/scintilla/Makefile=0A=
--- /usr/ports/x11-toolkits/scintilla/Makefile Sun May 20 17:04:12 2007=0A=
+++ /kirby/shared/scintilla/Makefile Fri Aug 10 13:17:40 2007=0A=
@@ -6,8 +6,7 @@=0A=
# $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 =
21:58:56 marcus Exp $=0A=
=0A=
PORTNAME=3D scintilla=0A=
-PORTVERSION=3D 1.73=0A=
-PORTREVISION=3D 1=0A=
+PORTVERSION=3D 1.74=0A=
CATEGORIES=3D x11-toolkits=0A=
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE} \=0A=
http://www.scintilla.org/=0A=
@@ -15,7 +14,7 @@=0A=
DISTNAME=3D scite${PORTVERSION:S/.//g}=0A=
EXTRACT_SUFX=3D .tgz=0A=
=0A=
-MAINTAINER=3D gnome at FreeBSD.org=0A=
+MAINTAINER=3D cyberbotx at cyberbotx.com=0A=
COMMENT=3D A full-featured free source code editing component for GTK+=0A=
=0A=
WRKSRC=3D ${WRKDIR}/${PORTNAME}/gtk=0A=
@@ -29,9 +28,11 @@=0A=
.if defined(WITH_GTK2)=0A=
USE_GNOME=3D gtk20=0A=
PKGNAMESUFFIX:=3D -gtk2=0A=
+PLIST_SUB+=3D GTK2=3D"" GTK1=3D"@comment "=0A=
.else=0A=
USE_GNOME=3D gtk12=0A=
MAKE_ARGS+=3D GTK1=3Dyes=0A=
+PLIST_SUB+=3D GTK2=3D"@comment " GTK1=3D""=0A=
.endif=0A=
=0A=
.include <bsd.port.pre.mk>=0A=
@@ -49,5 +50,12 @@=0A=
${LN} -sf ${PREFIX}/lib/libscintilla.so.1 ${PREFIX}/lib/libscintilla.so=0A=
${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.1 =
${PREFIX}/lib=0A=
${LN} -sf ${PREFIX}/lib/libscintilla_lexers.so.1 =
${PREFIX}/lib/libscintilla_lexers.so=0A=
+=0A=
+post-install:=0A=
+.if defined(WITH_GTK2)=0A=
+ ${TOUCH} ${PREFIX}/include/scintilla/.scintilla-gtk2=0A=
+.else=0A=
+ ${TOUCH} ${PREFIX}/include/scintilla/.scintilla-gtk1=0A=
+.endif=0A=
=0A=
.include <bsd.port.post.mk>=0A=
diff -ruN --exclude=3DCVS /usr/ports/x11-toolkits/scintilla/distinfo =
/kirby/shared/scintilla/distinfo=0A=
--- /usr/ports/x11-toolkits/scintilla/distinfo Sun Apr 29 10:23:42 2007=0A=
+++ /kirby/shared/scintilla/distinfo Wed Aug 1 09:09:43 2007=0A=
@@ -1,3 +1,3 @@=0A=
-MD5 (scite173.tgz) =3D 0e8e4139b5f5db445b3da9ff070d9d3a=0A=
-SHA256 (scite173.tgz) =3D =
1dde09224162f3dadd440ba08beb1f425c997e73559e2107f4fc4bfd52a779c4=0A=
-SIZE (scite173.tgz) =3D 1343699=0A=
+MD5 (scite174.tgz) =3D 09ad25f1fa6dab3feec41dba2480047f=0A=
+SHA256 (scite174.tgz) =3D =
10640a1c4bde4b1f5726085c95f7a139a044853911ebeaffa58f42aa26359e01=0A=
+SIZE (scite174.tgz) =3D 1460459=0A=
diff -ruN --exclude=3DCVS =
/usr/ports/x11-toolkits/scintilla/files/patch-aa =
/kirby/shared/scintilla/files/patch-aa=0A=
--- /usr/ports/x11-toolkits/scintilla/files/patch-aa Sun Oct 16 16:01:22 =
2005=0A=
+++ /kirby/shared/scintilla/files/patch-aa Fri Aug 10 15:38:22 2007=0A=
@@ -1,5 +1,5 @@=0A=
---- makefile.orig Fri Oct 15 19:41:26 2004=0A=
-+++ makefile Sun Oct 16 02:51:33 2005=0A=
+--- makefile.orig Fri Aug 10 15:26:43 2007=0A=
++++ makefile Fri Aug 10 15:31:26 2007=0A=
@@ -8,16 +8,17 @@=0A=
# To force GTK+ 1 build, define GTK1 on the make command line.=0A=
=0A=
@@ -29,42 +29,42 @@=0A=
+CXXFLAGS+=3D-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)=0A=
else=0A=
-CXXFLAGS=3D-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)=0A=
-+CXXFLAGS+=3D-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)=0A=
++CXXFLAGS+=3D-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)=0A=
endif=0A=
=0A=
# If explicit setting of GTK1 or GTK2 then use that else look for=0A=
# pkg-config which is an OK indication that GTK2 is available=0A=
ifdef GTK2=0A=
--CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0=0A=
+-CONFIGFLAGS=3D$(shell pkg-config --cflags gtk+-2.0)=0A=
+CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0 gthread-2.0=0A=
MARSHALLER=3Dscintilla-marshal.o=0A=
else=0A=
ifdef GTK1=0A=
--CONFIGFLAGS=3Dgtk-config --cflags=0A=
+-CONFIGFLAGS=3D$(shell gtk-config --cflags)=0A=
+CONFIGFLAGS=3Dpkg-config --cflags gtk+ gthread=0A=
else=0A=
ifneq (,$(findstring /,$(shell whereis pkg-config)))=0A=
--CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0=0A=
+-CONFIGFLAGS=3D$(shell pkg-config --cflags gtk+-2.0)=0A=
+CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0 gthread-2.0=0A=
MARSHALLER=3Dscintilla-marshal.o=0A=
else=0A=
--CONFIGFLAGS=3Dgtk-config --cflags=0A=
-+CONFIGFLAGS=3Dgtk-config --cflags gtk+ gthread=0A=
+-CONFIGFLAGS=3D$(shell gtk-config --cflags)=0A=
++CONFIGFLAGS=3Dpkg-config --cflags gtk+ gthread=0A=
endif=0A=
endif=0A=
endif=0A=
=0A=
.cxx.o:=0A=
-- $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<=0A=
+- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<=0A=
+ $(CC) $(PICFLAGS) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<=0A=
.c.o:=0A=
-- $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<=0A=
+- $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<=0A=
+ $(CCOMP) $(PICFLAGS) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<=0A=
=0A=
#++Autogenerated -- run src/LexGen.py to regenerate=0A=
#**LEXOBJS=3D\\\n\(\*.o \)=0A=
-@@ -72,7 +73,7 @@=0A=
- LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o=0A=
+@@ -75,22 +76,24 @@=0A=
+ LexVHDL.o LexYAML.o=0A=
#--Autogenerated -- end of automatically generated section=0A=
=0A=
-all: $(COMPLIB)=0A=
@@ -72,15 +72,20 @@=0A=
=0A=
clean:=0A=
rm -f *.o $(COMPLIB)=0A=
-@@ -83,10 +84,11 @@=0A=
- $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o =
StyleContext.o Document.o CallTip.o \=0A=
+ =0A=
+ deps:=0A=
+- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e =
's/\/usr.* //' | grep [a-zA-Z] >deps.mak=0A=
++ $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e =
's/\/usr.* //' | grep [a-zA-Z] >deps.mak=0A=
+ =0A=
+ $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o =
StyleContext.o \=0A=
+ CharClassify.o Decoration.o Document.o CallTip.o \=0A=
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o =
PlatGTK.o \=0A=
- KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \=0A=
-- RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \=0A=
+ KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o =
ViewStyle.o \=0A=
+ RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o =
UniConversion.o XPM.o \=0A=
- $(MARSHALLER) $(LEXOBJS)=0A=
- $(AR) rc $@ $^=0A=
- $(RANLIB) $@=0A=
-+ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o =
$(MARSHALLER)=0A=
++ $(MARSHALLER)=0A=
+ $(AR) `$(CONFIGFLAGS:cflags=3Dlibs)` -o $@ $^=0A=
+=0A=
+$(LEXRLIB): $(LEXOBJS)=0A=
diff -ruN --exclude=3DCVS /usr/ports/x11-toolkits/scintilla/pkg-plist =
/kirby/shared/scintilla/pkg-plist=0A=
--- /usr/ports/x11-toolkits/scintilla/pkg-plist Thu Oct 18 11:38:43 2001=0A=
+++ /kirby/shared/scintilla/pkg-plist Fri Aug 10 13:13:57 2007=0A=
@@ -1,3 +1,5 @@=0A=
+%%GTK1%%include/scintilla/.scintilla-gtk1=0A=
+%%GTK2%%include/scintilla/.scintilla-gtk2=0A=
include/scintilla/Accessor.h=0A=
include/scintilla/KeyWords.h=0A=
include/scintilla/Platform.h=0A=
------=_NextPart_000_0270_01C7DB65.AA880810--
More information about the freebsd-gnome
mailing list