Группа :: Графические оболочки/Прочее
Пакет: fluxbox
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: fluxbox-0.9.12-alt-makefile-configure-with_locale_path_option.patch
diff -ru fluxbox-0.9.12.orig/configure.in fluxbox-0.9.12/configure.in
--- fluxbox-0.9.12.orig/configure.in 2005-03-16 20:00:42 +0600
+++ fluxbox-0.9.12/configure.in 2005-03-16 20:08:15 +0600
@@ -538,6 +538,15 @@
)
AC_SUBST(DEFAULT_INIT)
+AC_ARG_WITH(
+ locale-path,
+ [ --with-locale-path=path location for nls files (PREFIX/share/fluxbox/nls)],
+ LOCALE_PATH=$with_locale_path,
+ LOCALE_PATH=$prefix/share/fluxbox/nls
+)
+AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files")
+AC_SUBST(LOCALE_PATH)
+
dnl Determine the return type of signal handlers
AC_TYPE_SIGNAL
@@ -553,6 +562,7 @@
AC_MSG_RESULT([Using '$DEFAULT_STYLE' by default style.])
AC_MSG_RESULT([Using '$DEFAULT_KEYS' for location keys file.])
AC_MSG_RESULT([Using '$DEFAULT_INIT' for location init file.])
+AC_MSG_RESULT([Using '$LOCALE_PATH' for nls files.])
AC_MSG_RESULT([Using '$CXX' for C++ compiler.])
AC_MSG_RESULT([Building with '$CXXFLAGS' for C++ compiler flags.])
AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
diff -ru fluxbox-0.9.12.orig/src/FbTk/I18n.cc fluxbox-0.9.12/src/FbTk/I18n.cc
--- fluxbox-0.9.12.orig/src/FbTk/I18n.cc 2004-11-19 18:01:38 +0600
+++ fluxbox-0.9.12/src/FbTk/I18n.cc 2005-03-16 20:01:59 +0600
@@ -59,9 +59,6 @@
#include <iostream>
-// TODO: FIXME: the LOCALEPATH from this file should be ./configure-ed into config.h
-#include "../defaults.hh"
-
using std::cerr;
using std::endl;
using std::string;
diff -ru fluxbox-0.9.12.orig/src/main.cc fluxbox-0.9.12/src/main.cc
--- fluxbox-0.9.12.orig/src/main.cc 2004-12-28 03:52:03 +0600
+++ fluxbox-0.9.12/src/main.cc 2005-03-16 20:03:42 +0600
@@ -80,6 +80,7 @@
ostr<<_FBTEXT(Common, DefaultKeyFile, " keys", "default key file (right aligned - make sure same width as other default values)")<<": "<<DEFAULTKEYSFILE<<endl;
ostr<<_FBTEXT(Common, DefaultInitFile, " init", "default init file (right aligned - make sure same width as other default values)")<<": "<<DEFAULT_INITFILE<<endl;
+// TODO: FIXME: print LOCALEPATH too
const char NOT[] = "-";
ostr<<endl<<
diff -ru fluxbox-0.9.12.orig/src/Makefile.am fluxbox-0.9.12/src/Makefile.am
--- fluxbox-0.9.12.orig/src/Makefile.am 2005-03-16 20:00:42 +0600
+++ fluxbox-0.9.12/src/Makefile.am 2005-03-16 20:01:59 +0600
@@ -40,7 +40,6 @@
echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"' >> defaults.hh
echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"' >> defaults.hh
echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"' >> defaults.hh
- echo '#define LOCALEPATH "$(pkgdatadir)/nls"' >> defaults.hh
# an extra dep for fluxbox
diff -ru fluxbox-0.9.12.orig/src/Makefile.in fluxbox-0.9.12/src/Makefile.in
--- fluxbox-0.9.12.orig/src/Makefile.in 2005-03-16 20:00:42 +0600
+++ fluxbox-0.9.12/src/Makefile.in 2005-03-16 20:01:59 +0600
@@ -2368,7 +2368,6 @@
echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"' >> defaults.hh
echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"' >> defaults.hh
echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"' >> defaults.hh
- echo '#define LOCALEPATH "$(pkgdatadir)/nls"' >> defaults.hh
# an extra dep for fluxbox