public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-editors/bluefish/files: bluefish-1.3.8-gucharmap-automagic.patch
@ 2009-11-17 18:49 Daniel Pielmeier (billie)
  0 siblings, 0 replies; 2+ messages in thread
From: Daniel Pielmeier (billie) @ 2009-11-17 18:49 UTC (permalink / raw
  To: gentoo-commits

billie      09/11/17 18:49:57

  Added:                bluefish-1.3.8-gucharmap-automagic.patch
  Log:
  Version bump. Added a dirty patch which fixes automagic installation of the charmap plugin.
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.1                  app-editors/bluefish/files/bluefish-1.3.8-gucharmap-automagic.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/bluefish/files/bluefish-1.3.8-gucharmap-automagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/bluefish/files/bluefish-1.3.8-gucharmap-automagic.patch?rev=1.1&content-type=text/plain

Index: bluefish-1.3.8-gucharmap-automagic.patch
===================================================================
--- 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])
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-editors/bluefish/files: bluefish-1.3.8-gucharmap-automagic.patch
@ 2010-11-29 19:54 Hanno Boeck (hanno)
  0 siblings, 0 replies; 2+ messages in thread
From: Hanno Boeck (hanno) @ 2010-11-29 19:54 UTC (permalink / raw
  To: gentoo-commits

hanno       10/11/29 19:54:15

  Removed:              bluefish-1.3.8-gucharmap-automagic.patch
  Log:
  Remove unused patch, fix #340549.
  
  (Portage version: 2.1.9.25/cvs/Linux x86_64)



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-11-29 19:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-29 19:54 [gentoo-commits] gentoo-x86 commit in app-editors/bluefish/files: bluefish-1.3.8-gucharmap-automagic.patch Hanno Boeck (hanno)
  -- strict thread matches above, loose matches on Subject: below --
2009-11-17 18:49 Daniel Pielmeier (billie)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox