r482 - in x86/branches/utf8: . packages/irssi root/.irssi

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Mon Aug 1 21:23:00 PDT 2005


Author: alexander
Date: 2005-08-01 22:22:59 -0600 (Mon, 01 Aug 2005)
New Revision: 482

Modified:
   x86/branches/utf8/BUGS
   x86/branches/utf8/packages/irssi/Makefile
   x86/branches/utf8/root/.irssi/config
Log:
Updated irssi to yesterday's SVN version.


Modified: x86/branches/utf8/BUGS
===================================================================
--- x86/branches/utf8/BUGS	2005-08-02 03:46:06 UTC (rev 481)
+++ x86/branches/utf8/BUGS	2005-08-02 04:22:59 UTC (rev 482)
@@ -85,3 +85,20 @@
 
 ion:
   In UTF-8 locales, the default font for window titles is ugly.
+
+irssi:
+  SVN version is used because of its "arbitrary charset recoding" function.
+  Without this function, users of ru_RU.KOI8-R and ru_RU.UTF-8 can't talk
+  with each other (well, there is a workaround, to use "screen" for recoding).
+  However, this function is implemented in some unnecessarily complex way.
+  The default upstream configuration treats incoming messages as UTF-8 by
+  default, but sends them in locale charset (i.e. this is broken). The Live CD
+  configuration treats incoming messages as UTF-8 by default and sends also in
+  UTF-8. To change the default if the channel encoding is not UTF-8 (e.g.
+  KOI8-R):
+  /set recode_out_default_charset KOI8-R
+  /set recode_fallback KOI8-R
+  Recoding is done to and from terminal i/o charset (determined bty LC_CTYPE).
+  Note that setting the channel charset in all GUI chat clients is much
+  easier and there is a de-facto standard for such operation:
+  /charset KOI8-R

Modified: x86/branches/utf8/packages/irssi/Makefile
===================================================================
--- x86/branches/utf8/packages/irssi/Makefile	2005-08-02 03:46:06 UTC (rev 481)
+++ x86/branches/utf8/packages/irssi/Makefile	2005-08-02 04:22:59 UTC (rev 482)
@@ -1,11 +1,16 @@
-# Eterm Makefile
+# Irssi Makefile
 
+# SVN version is used because of its "arbitrary charset recoding" function.
+# Without this, irssi assumes that locale charset and irc charset are the same,
+# which means that users from the same country but using different locales
+# (e.g. ru_RU.KOI8-R and ru_RU.UTF-8) cannot talk to each other.
+
 # Package versions
 NM= irssi
-VRS= 0.8.9
+VRS= r3894
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
-URL= http://irssi.org/files/$(FILE)
+URL= http://svn.irssi.org/repos/irssi/trunk/
 
 #RULES
 
@@ -18,9 +23,14 @@
 	@echo ""
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -f $(FILE) ] ; then \
+	  svn co -$(VRS) $(URL) $(DIR) && \
+	  cd $(DIR) && NOCONFIGURE=1 ./autogen.sh && \
+	  find . -name .svn | xargs rm -rf && cd .. && \
+	  tar jcf $(FILE) $(DIR) && \
+	  rm -rf $(DIR); fi
 	@if [ ! -f /usr/bin/irssi ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
+	 ./configure --prefix=/usr --sysconfdir=/etc && \
 	 make -j3 && make install ; fi
 	@cp -ra $(ROOT)/root/.irssi /root
 	@make clean

Modified: x86/branches/utf8/root/.irssi/config
===================================================================
--- x86/branches/utf8/root/.irssi/config	2005-08-02 03:46:06 UTC (rev 481)
+++ x86/branches/utf8/root/.irssi/config	2005-08-02 04:22:59 UTC (rev 482)
@@ -7,11 +7,6 @@
     port = "6667";
   },
   { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
-  { 
-    address = "irc.freenode.net";
-    chatnet = "freenode";
-    port = "6667";
-  },
   { address = "irc.gnome.org"; chatnet = "GIMPNet"; port = "6667"; },
   { address = "irc.ptlink.net"; chatnet = "PTlink"; port = "6667"; },
   { 
@@ -25,11 +20,7 @@
     port = "6667";
   },
   { address = "irc.ptnet.org"; chatnet = "PTnet"; port = "6667"; },
-  { 
-    address = "irc.azzurra.org";
-    chatnet = "AzzurraNET";
-    port = "6667";
-  },
+  { address = "irc.azzurra.org"; chatnet = "AzzurraNET"; port = "6667"; },
   { address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; },
   {
     address = "irc.linuxfromscratch.org";
@@ -71,13 +62,6 @@
     max_msgs = "3";
     max_whois = "30";
   };
-  freenode = {
-    type = "IRC";
-    max_kicks = "4";
-    max_modes = "4";
-    max_msgs = "1";
-    max_whois = "1";
-  };
   GIMPNet = {
     type = "IRC";
     max_kicks = "4";
@@ -130,9 +114,8 @@
 
 channels = (
   { name = "#irssi"; chatnet = "ircnet"; autojoin = "No"; },
-  { name = "#irssi"; chatnet = "freenode"; autojoin = "No"; },
   { name = "silc"; chatnet = "silc"; autojoin = "No"; },
-  { name = "#lfs-support"; chatnet = "lfs"; autojoin = "yes"; }
+  { name = "#lfs-support"; chatnet = "lfs"; autojoin = "yes"; },
   { name = "#lfs"; chatnet = "lfs"; autojoin = "yes"; }
 );
 
@@ -180,6 +163,10 @@
   SBAR = "STATUSBAR";
   INVITELIST = "mode $C +I";
   Q = "QUERY";
+  "MANUAL-WINDOWS" = "set use_status_window off;set autocreate_windows off;set autocreate_query_level none;set autoclose_windows off;set reuse_unused_windows on;save";
+  EXEMPTLIST = "mode $C +e";
+  TAG = "script exec Irssi::server_find_tag('$0')->command('$1-');";
+  ATAG = "script exec Irssi::active_win->change_server(Irssi::server_find_tag(\"$0\"));";
 };
 
 statusbar = {
@@ -293,7 +280,12 @@
     };
   };
 };
+
 settings = {
-  core = { real_name = "guest"; user_name = "guest"; nick = "lfs-livecd"; };
-  "fe-text" = { term_force_colors = "yes"; };
+  core = {
+    real_name = "guest";
+    user_name = "guest";
+    nick = "lfs-livecd";
+    recode_out_default_charset = "UTF-8";
+  };
 };




More information about the livecd mailing list