summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors/scite')
-rw-r--r--app-editors/scite/ChangeLog6
-rw-r--r--app-editors/scite/files/scite-1.73-iconv.patch25
-rw-r--r--app-editors/scite/scite-1.73.ebuild3
3 files changed, 6 insertions, 28 deletions
diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 9f471d8a76c8..762bbda681a9 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/scite
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.65 2007/04/19 22:09:11 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.66 2007/04/21 12:47:58 nelchael Exp $
+
+ 21 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+ -files/scite-1.73-iconv.patch, scite-1.73.ebuild:
+ Remove iconv patch for now, as it breaks builds.
19 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+files/scite-1.73-iconv.patch, scite-1.73.ebuild:
diff --git a/app-editors/scite/files/scite-1.73-iconv.patch b/app-editors/scite/files/scite-1.73-iconv.patch
deleted file mode 100644
index 840ac2208c07..000000000000
--- a/app-editors/scite/files/scite-1.73-iconv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- scite/gtk/makefile.old 2007-04-19 21:19:30.000000000 +0200
-+++ scite/gtk/makefile 2007-04-19 21:20:10.000000000 +0200
-@@ -26,11 +26,13 @@
- CONFIGFLAGS=pkg-config --cflags gtk+-2.0
- CONFIGLIB=pkg-config --libs gtk+-2.0 gthread-2.0
- CONFIGTHREADS=
-+CONFIGICONV=-liconv
- gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
- else
- CONFIGFLAGS=gtk-config --cflags
- CONFIGLIB=gtk-config --libs
- CONFIGTHREADS=glib-config --libs gthread
-+CONFIGICONV=
- gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
- endif
- ifndef prefix
-@@ -103,7 +105,7 @@
- $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
- MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
- $(COMPLIB) $(LUA_OBJS)
-- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)`
-+ $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)` $(CONFIGICONV)
-
- # Automatically generate header dependencies with "make deps"
- include deps.mak
diff --git a/app-editors/scite/scite-1.73.ebuild b/app-editors/scite/scite-1.73.ebuild
index f008da76a0ec..42bace296e08 100644
--- a/app-editors/scite/scite-1.73.ebuild
+++ b/app-editors/scite/scite-1.73.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.73.ebuild,v 1.2 2007/04/19 22:09:11 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.73.ebuild,v 1.3 2007/04/21 12:47:58 nelchael Exp $
inherit toolchain-funcs eutils
@@ -42,7 +42,6 @@ src_unpack() {
-e 's#-g root#-g 0#' \
|| die "error patching makefile"
epatch ${FILESDIR}/${P}-install.patch
- epatch ${FILESDIR}/${P}-iconv.patch
}
src_compile() {