Mailinglist Archive: opensuse-commit (1400 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package mutt for openSUSE:Factory checked in 
at 2011-11-05 11:21:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mutt (Old)
 and      /work/SRC/openSUSE:Factory/.mutt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mutt", Maintainer is "werner@xxxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/mutt/mutt.changes        2011-09-23 
02:13:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes   2011-11-05 
11:49:53.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Oct 25 22:17:13 CEST 2011 - vmiklos@xxxxxxxxxx
+
+- Add patch to be able to specify the color of the sidebar
+
+-------------------------------------------------------------------

New:
----
  nion.sidebar-color.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mutt.spec ++++++
--- /var/tmp/diff_new_pack.dUjFvi/_old  2011-11-05 11:53:32.000000000 +0100
+++ /var/tmp/diff_new_pack.dUjFvi/_new  2011-11-05 11:53:32.000000000 +0100
@@ -42,7 +42,7 @@
 #Requires:    desktop-data-SuSE
 AutoReqProv:    on
 Version:        1.5.21
-Release:        20
+Release:        21
 Summary:        Mail Program
 # ftp://ftp.mutt.org/mutt/devel/
 Source0:        %name-%version.tar.bz2
@@ -67,6 +67,7 @@
 Patch8:         mutt-1.5.21-opennfs.dif
 Patch9:         mutt-1.5.20-gpgme_set_locale.patch
 Patch10:        bug-676388-largefile.patch
+Patch11:        nion.sidebar-color.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir %{_sysconfdir}
 
@@ -93,6 +94,7 @@
 %patch8 -p0 
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1 -b .sidebar.color
 
 cp doc/Muttrc Muttrc.SuSE
 cp %{S:2} .


++++++ nion.sidebar-color.diff ++++++
diff -r 97d8bf4c46f9 PATCHES
--- a/PATCHES   Mon Jun 29 17:52:30 2009 +0200
+++ b/PATCHES   Mon Jun 29 17:54:21 2009 +0200
@@ -1,3 +1,4 @@
+nion.sidebar-color
 patch-1.5.19.sidebar.20090522.txt
 patch-1.5.19.rr.compressed.1
 patch-1.5.5.1.nt.xtitles.3.ab.1
diff -r 97d8bf4c46f9 color.c
--- a/color.c   Mon Jun 29 17:52:30 2009 +0200
+++ b/color.c   Mon Jun 29 17:54:21 2009 +0200
@@ -95,6 +95,7 @@
   { "index",           MT_COLOR_INDEX },
   { "sidebar_new",     MT_COLOR_NEW },
   { "sidebar_flagged", MT_COLOR_FLAGGED },
+  { "sidebar",         MT_COLOR_SIDEBAR },
   { NULL,              0 }
 };
 
@@ -144,6 +145,7 @@
 
   /* set some defaults */
   ColorDefs[MT_COLOR_STATUS] = A_REVERSE;
+  ColorDefs[MT_COLOR_SIDEBAR] = A_REVERSE;
   ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE;
   ColorDefs[MT_COLOR_SEARCH] = A_REVERSE;
   ColorDefs[MT_COLOR_MARKERS] = A_REVERSE;
diff -r 97d8bf4c46f9 mutt_curses.h
--- a/mutt_curses.h     Mon Jun 29 17:52:30 2009 +0200
+++ b/mutt_curses.h     Mon Jun 29 17:54:21 2009 +0200
@@ -125,6 +125,7 @@
   MT_COLOR_ATTACHMENT,
   MT_COLOR_SEARCH,
   MT_COLOR_BOLD,
+  MT_COLOR_SIDEBAR,
   MT_COLOR_UNDERLINE,
   MT_COLOR_INDEX,
   MT_COLOR_NEW,
diff -r 97d8bf4c46f9 sidebar.c
--- a/sidebar.c Mon Jun 29 17:52:30 2009 +0200
+++ b/sidebar.c Mon Jun 29 17:54:21 2009 +0200
@@ -196,22 +196,26 @@
     }
 
         /* get attributes for divider */
-       SETCOLOR(MT_COLOR_STATUS);
+       SETCOLOR(MT_COLOR_SIDEBAR);
 #ifndef USE_SLANG_CURSES
         attr_get(&attrs, &color_pair, 0);
 #else
         color_pair = attr_get();
 #endif
-       SETCOLOR(MT_COLOR_NORMAL);
+       /* SETCOLOR(MT_COLOR_SIDEBAR); */
 
        /* draw the divider */
 
        for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); 
lines++ ) {
                move(lines, SidebarWidth - delim_len);
-               addstr(NONULL(SidebarDelim));
-#ifndef USE_SLANG_CURSES
-                mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, 
color_pair, NULL);
-#endif
+               if (option (OPTASCIICHARS))
+                       addstr (NONULL (SidebarDelim));
+               else if (!option (OPTASCIICHARS) && !strcmp 
(NONULL(SidebarDelim), "|"))
+                       addch (ACS_VLINE);
+               else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), 
"|"))
+                       addstr ("\342\224\202");
+               else
+                       addstr (NONULL (SidebarDelim));
        }
 
        if ( Incoming == 0 ) return 0;

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx