diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2010-11-29 19:54:15 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2010-11-29 19:54:15 +0000 |
| commit | 16e3be26792a139761e94fc3e6b4d3594306ae40 (patch) | |
| tree | eea4f6b71d124c019d6b3df6d3133b36a94d80ec | |
| parent | Add various patches to fix compilation with Mono 2.8, fixing bug 340785. (diff) | |
| download | gentoo-2-16e3be26792a139761e94fc3e6b4d3594306ae40.tar.gz gentoo-2-16e3be26792a139761e94fc3e6b4d3594306ae40.tar.bz2 gentoo-2-16e3be26792a139761e94fc3e6b4d3594306ae40.zip | |
Remove unused patch, fix #340549.
(Portage version: 2.1.9.25/cvs/Linux x86_64)
| -rw-r--r-- | app-editors/bluefish/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/bluefish/files/bluefish-1.3.8-gucharmap-automagic.patch | 60 |
2 files changed, 5 insertions, 61 deletions
diff --git a/app-editors/bluefish/ChangeLog b/app-editors/bluefish/ChangeLog index 89eadc278611..645cb3735c30 100644 --- a/app-editors/bluefish/ChangeLog +++ b/app-editors/bluefish/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/bluefish # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.73 2010/08/03 23:09:25 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.74 2010/11/29 19:54:15 hanno Exp $ + + 29 Nov 2010; Hanno Boeck <hanno@gentoo.org> + -files/bluefish-1.3.8-gucharmap-automagic.patch: + Remove unused patch, fix #340549. 03 Aug 2010; Hanno Boeck <hanno@gentoo.org> bluefish-2.0.1.ebuild: Fix compilation with latest gettext. diff --git a/app-editors/bluefish/files/bluefish-1.3.8-gucharmap-automagic.patch b/app-editors/bluefish/files/bluefish-1.3.8-gucharmap-automagic.patch deleted file mode 100644 index 2d286ad30a68..000000000000 --- a/app-editors/bluefish/files/bluefish-1.3.8-gucharmap-automagic.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- configure.ac.old 2009-11-16 22:05:28.000000000 +0100 -+++ configure.ac 2009-11-16 23:46:49.000000000 +0100 -@@ -415,29 +415,38 @@ - - PKG_CHECK_MODULES([BLUEFISH_REQUIRED], [$BF_dependencies]) - --# optionally build the charmap plugin if gucharmap is available --PKG_CHECK_MODULES( -- [CHARMAP_PLUGIN], -- [gucharmap-2], -- [ -- build_charmap_plugin=yes -- AC_DEFINE([HAVE_LIBGUCHARMAP_2], [1], [Define to 1 if you have the `gucharmap-2' library (-lgucharmap).]) -- ], -- [PKG_CHECK_MODULES( -+# build the charmap plugin -+ -+AC_ARG_ENABLE( -+ [charmap], -+ AC_HELP_STRING( -+ [--enable-charmap], -+ [enable (or disable) the charmap plugin needs gucharmap @<:@default=no@:>@] -+ ) -+) -+ -+if test "x$enable_charmap" != "xno"; then -+ PKG_CHECK_MODULES( - [CHARMAP_PLUGIN], -- [gucharmap >= 2.20], -+ [gucharmap-2], - [ - build_charmap_plugin=yes -- AC_DEFINE([HAVE_LIBGUCHARMAP], [1], [Define to 1 if you have the `gucharmap' library (-lgucharmap).]) -+ AC_DEFINE([HAVE_LIBGUCHARMAP_2], [1], [Define to 1 if you have the `gucharmap-2' library (-lgucharmap).]) - ], -- [ -- build_charmap_plugin=no -- AC_MSG_WARN([Disabling the building of the charmap plugin.]) -- AC_MSG_WARN([Install gucharmap/gucharmap2 (>= 2.20) library/headers to build the plugin.]) -- ] -- )] --) --AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xyes"]) -+ [PKG_CHECK_MODULES( -+ [CHARMAP_PLUGIN], -+ [gucharmap >= 2.20], -+ [ -+ build_charmap_plugin=yes -+ AC_DEFINE([HAVE_LIBGUCHARMAP], [1], [Define to 1 if you have the `gucharmap' library (-lgucharmap).]) -+ ], -+ )] -+ ) -+ AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xyes"]) -+else -+ AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xno"]) -+ AC_MSG_NOTICE([Disable building charmap plugin.]) -+fi - - AC_SEARCH_LIBS([nanosleep], [posix4 rt]) - |