rpms/conky/devel conky-1.7.1.1-nonxft.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 conky.spec, 1.14, 1.15 sources, 1.9, 1.10 conky-1.7.0-texeci.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/conky/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5632

Modified Files:
	.cvsignore conky.spec sources 
Added Files:
	conky-1.7.1.1-nonxft.patch 
Removed Files:
	conky-1.7.0-texeci.patch 
Log Message:
- Update to 1.7.1.1


conky-1.7.1.1-nonxft.patch:

--- NEW FILE conky-1.7.1.1-nonxft.patch ---
commit 1571bb1aad01d8a475d7022ce4a47740fe90149d
Author: Brenden Matthews <brenden at rty.ca>
Date:   Wed Jun 10 14:08:39 2009 -0600

    Fix regression with loading of non-Xft fonts (sf.net #2804324).

diff --git a/ChangeLog b/ChangeLog
index 3973494..a8c6166 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-06-10
+	* Fix regression with loading of non-Xft fonts (sf.net #2804324)
+
 2009-06-09
 	* Fixed a regression which causes fonts to not be rendered properly with
 	certain types of windows
diff --git a/src/conky.c b/src/conky.c
index 98492b6..bad64f7 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -6526,6 +6526,7 @@ static void draw_line(char *s)
 
 					cur_y -= font_ascent();
 					selected_font = specials[special_index].font_added;
+					set_font();
 					if (cur_y + font_ascent() < cur_y + old) {
 						cur_y += old;
 					} else {
diff --git a/src/fonts.c b/src/fonts.c
index 67e363a..61c7b85 100644
--- a/src/fonts.c
+++ b/src/fonts.c
@@ -32,6 +32,16 @@ int selected_font = 0;
 int font_count = -1;
 struct font_list *fonts = NULL;
 
+void set_font(void)
+{
+#ifdef XFT
+	if (use_xft) return;
+#endif /* XFT */
+	if (font_count > -1 && fonts[selected_font].font) {
+		XSetFont(display, window.gc, fonts[selected_font].font->fid);
+	}
+}
+
 void setup_fonts(void)
 {
 	if ((output_methods & TO_X) == 0) {
@@ -45,7 +55,8 @@ void setup_fonts(void)
 		window.xftdraw = XftDrawCreate(display, window.drawable,
 				DefaultVisual(display, screen), DefaultColormap(display, screen));
 	}
-#endif
+#endif /* XFT */
+	set_font();
 }
 
 int add_font(const char *data_in)
@@ -171,7 +182,7 @@ void load_fonts(void)
 		}
 #endif
 		/* load normal font */
-		if (fonts[i].font || (fonts[i].font = XLoadQueryFont(display, fonts[i].name)) == NULL) {
+		if (!fonts[i].font && (fonts[i].font = XLoadQueryFont(display, fonts[i].name)) == NULL) {
 			ERR("can't load font '%s'", fonts[i].name);
 			if ((fonts[i].font = XLoadQueryFont(display, "fixed")) == NULL) {
 				CRIT_ERR("can't load font '%s'", "fixed");
diff --git a/src/fonts.h b/src/fonts.h
index 5ff3d46..4853047 100644
--- a/src/fonts.h
+++ b/src/fonts.h
@@ -71,6 +71,7 @@ extern int selected_font;
 extern int font_count;
 
 void setup_fonts(void);
+void set_font(void);
 int add_font(const char *);
 void set_first_font(const char *);
 void free_fonts(void);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	11 May 2009 16:42:06 -0000	1.9
+++ .cvsignore	17 Jun 2009 11:56:55 -0000	1.10
@@ -1 +1 @@
-conky-1.7.0.tar.bz2
+conky-1.7.1.1.tar.bz2


Index: conky.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/conky.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- conky.spec	11 May 2009 16:42:06 -0000	1.14
+++ conky.spec	17 Jun 2009 11:56:55 -0000	1.15
@@ -1,4 +1,7 @@
+%bcond_without alsa
 %bcond_without audacious
+%bcond_with imlib
+%bcond_without lua
 %bcond_with moc
 %bcond_without mpd
 %bcond_with nvidia
@@ -7,7 +10,7 @@
 %bcond_without wlan
 
 Name:           conky 
-Version:        1.7.0
+Version:        1.7.1.1
 Release:        1%{?dist}
 Summary:        A system monitor for X 
 
@@ -15,8 +18,8 @@ Group:          User Interface/X
 License:        GPLv3+
 URL:            http://conky.sf.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch1:         conky-1.7.0-texeci.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         conky-1.7.1.1-nonxft.patch
 
 BuildRequires:  libXft-devel
 BuildRequires:  libXt-devel
@@ -26,6 +29,9 @@ BuildRequires:  libXext-devel
 BuildRequires:  audacious-devel
 BuildRequires:  dbus-glib-devel
 %endif
+%{?with_alsa:BuildRequires: alsa-lib-devel}
+%{?with_imlib:BuildRequires: imlib2-devel}
+%{?with_lua:BuildRequires: lua-devel}
 %{?with_nvidia:BuildRequires: libXNVCtrl-devel}
 %{?with_rss:BuildRequires: curl-devel}
 %{?with_wlan:BuildRequires: wireless-tools-devel}
@@ -36,7 +42,7 @@ It just keeps on given'er. Yeah.
 
 %prep
 %setup -q
-%patch1 -p1 -b .texeci
+%patch0 -p1 -b .nonxft
 
 for i in AUTHORS; do
     iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
@@ -44,7 +50,10 @@ done
 
 %build
 %configure \
+%{!?with_alsa:     --disable-alsa} \
 %{?with_audacious: --enable-audacious=yes} \
+%{?with_imlib:     --enable-imlib2} \
+%{!?with_lua:      --disable-lua} \
 %{!?with_moc:      --disable-moc} \
 %{!?with_mpd:      --disable-mpd} \
 %{?with_nvidia:    --enable-nvidia} \
@@ -74,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 17 2009 Miroslav Lichvar <mlichvar at redhat.com> - 1.7.1.1-1
+- Update to 1.7.1.1
+
 * Mon May 11 2009 Miroslav Lichvar <mlichvar at redhat.com> - 1.7.0-1
 - Update to 1.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 May 2009 16:42:06 -0000	1.9
+++ sources	17 Jun 2009 11:56:56 -0000	1.10
@@ -1 +1 @@
-10360c37d76ab25f4d585bcdfd07f075  conky-1.7.0.tar.bz2
+153a661e78a466c95b1b332e7cd599cb  conky-1.7.1.1.tar.bz2


--- conky-1.7.0-texeci.patch DELETED ---