rpms/xteddy/EL-5 xteddy-2.0.1-visual.patch, NONE, 1.1 xteddy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/xteddy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1633/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	xteddy-2.0.1-visual.patch xteddy.spec 
Log Message:
Initial import

xteddy-2.0.1-visual.patch:

--- NEW FILE xteddy-2.0.1-visual.patch ---
Imlib picks visual with highest possible depth, which are ARGB visuals in
case Composite extensions are in use, and which it can not handle. Use the
default, RGB, instead.

Lubomir Rintel <lkundrak at v3.sk>

diff -up xteddy-2.0.1/xteddy.c.visual xteddy-2.0.1/xteddy.c
--- xteddy-2.0.1/xteddy.c.visual	2008-12-04 12:30:18.000000000 +0100
+++ xteddy-2.0.1/xteddy.c	2008-12-04 12:30:21.000000000 +0100
@@ -122,6 +122,8 @@ int main(int argc, char **argv)
   Cursor               cursor;
   char                *teddy;
   char                *file;
+  ImlibInitParams      params;
+  Visual              *visual;
 
   /* Window movement variables */
   XWindowChanges       winchanges;
@@ -172,7 +174,12 @@ int main(int argc, char **argv)
   display_width  = DisplayWidth(display, screen_num);
   display_height = DisplayHeight(display, screen_num);
 
-  if ( !(id=Imlib_init(display)) ) return -1;
+  /* Determine the correct visual */
+  visual = DefaultVisual(display, screen_num);
+  params.flags = PARAMS_VISUALID;
+  params.visualid = visual->visualid;
+
+  if ( !(id=Imlib_init_with_params(display, &params)) ) return -1;
   if ( !(file = InitTeddy(teddy)) ) {
     fprintf(stderr, "Can not find any image with name %s.\n", teddy);
     return -1;


--- NEW FILE xteddy.spec ---
Name:           xteddy
Version:        2.0.1
Release:        2%{?dist}
Summary:        Tool to sit around silently, look cute, and make you smile

Group:          Amusements/Games
License:        GPL+
URL:            http://webstaff.itn.liu.se/~stegu/xteddy/
Source0:        http://webstaff.itn.liu.se/~stegu/xteddy/%{name}-%{version}.tar.gz
# Aleady submitted upstream by mail
Patch0:         xteddy-2.0.1-visual.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  imlib-devel libpng-devel

%description
Xteddy is your virtual comfort when things get rough. It can do everything
a real teddy bear can do. That is, I can sit around silently, look cute,
and make you smile. 


%prep
%setup -q
%patch0 -p1 -b .visual


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/xteddy
%{_bindir}/xteddy_test
%{_bindir}/xtoys
%{_mandir}/man1/xteddy.1*
%{_datadir}/xteddy
%doc COPYING README AUTHORS ChangeLog NEWS
%doc xteddy.README xtuxxy.credit


%changelog
* Sat Dec 06 2008 Lubomir Rintel <lkundrak at v3.sk> 2.0.1-2
- Own /usr/share/xteddy (thanks to Ralf Corsepius)

* Thu Dec 04 2008 Lubomir Rintel <lkundrak at v3.sk> 2.0.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xteddy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:18:19 -0000	1.1
+++ .cvsignore	28 Dec 2008 20:31:38 -0000	1.2
@@ -0,0 +1 @@
+xteddy-2.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xteddy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:18:19 -0000	1.1
+++ sources	28 Dec 2008 20:31:38 -0000	1.2
@@ -0,0 +1 @@
+d33bfe05f18259a3f7fd17ae256c5644  xteddy-2.0.1.tar.gz