![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package perl-Tk checked in at Sun Aug 6 21:57:28 CEST 2006. -------- --- perl-Tk/perl-Tk.changes 2006-07-07 14:06:45.000000000 +0200 +++ perl-Tk/perl-Tk.changes 2006-08-06 16:21:48.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 6 16:21:38 CEST 2006 - aj@suse.de + +- Fix build with X11R7. + +------------------------------------------------------------------- New: ---- Tk-804.027-null.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Tk.spec ++++++ --- /var/tmp/diff_new_pack.IX2rfv/_old 2006-08-06 21:57:19.000000000 +0200 +++ /var/tmp/diff_new_pack.IX2rfv/_new 2006-08-06 21:57:19.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: perl-Tk -BuildRequires: libusb resmgr xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-devel xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-scalable +BuildRequires: xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-devel xorg-x11-fonts xorg-x11-fonts-100dpi xorg-x11-fonts-scalable %ifnarch s390 s390x BuildRequires: xorg-x11-server %endif @@ -22,13 +22,14 @@ Obsoletes: perl_tk Autoreqprov: on Version: 804.027 -Release: 15 +Release: 16 Summary: Perl Tk URL: http://cpan.org/modules/by-module/Tk/ Source: Tk-%{version}.tar.bz2 Patch: Tk-%{version}-lib64.diff Patch2: Tk-%{version}-macro.diff Patch3: Tk-%{version}-tkEvent.diff +Patch4: Tk-%{version}-null.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,6 +49,7 @@ fi %patch2 %patch3 +%patch4 %build find -name "*.orig" -exec rm {} \; @@ -80,7 +82,7 @@ mv t/browseentry2.t t/browseentry2.tt mv t/entry.t t/entry.tt mv t/listbox.t t/listbox.tt -Xvfb :95 -fp /usr/X11R6/lib/X11/fonts/misc & +Xvfb :95 & trap "kill $!" EXIT sleep 5 DISPLAY=:95 make test @@ -106,6 +108,8 @@ /var/adm/perl-modules/perl-Tk %changelog -n perl-Tk +* Sun Aug 06 2006 - aj@suse.de +- Fix build with X11R7. * Fri Jul 07 2006 - anicka@suse.cz - build with XFT=1 [#181927] * Fri Feb 24 2006 - anicka@suse.cz ++++++ Tk-804.027-null.diff ++++++ --- pTk/mTk/unix/tkUnixXft.c +++ pTk/mTk/unix/tkUnixXft.c @@ -364,7 +364,7 @@ pattern = XftPatternBuild (0, XFT_FAMILY, XftTypeString, faPtr->family, - 0); + NULL); if (faPtr->size > 0) XftPatternAddInteger (pattern, XFT_SIZE, faPtr->size); else @@ -429,7 +429,7 @@ Tk_ScreenNumber (tkwin), 0, XFT_FAMILY, - 0); + NULL); for (i = 0; i < list->nfont; i++) { if (XftPatternGetString (list->fonts[i], XFT_FAMILY, 0, &family) == XftResultMatch) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de