Hello community, here is the log from the commit of package imlib2 checked in at Sat Aug 12 19:00:50 CEST 2006. -------- --- imlib2/imlib2.changes 2006-02-07 00:35:45.000000000 +0100 +++ imlib2/imlib2.changes 2006-08-11 16:06:41.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 11 16:05:28 CEST 2006 - jw@suse.de + +- RGB_TXT_PATH added to loader_xpm.c + defined now as /usr/share/X11/rgb.txt + +------------------------------------------------------------------- New: ---- imlib2-X11R6-xorg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imlib2.spec ++++++ --- /var/tmp/diff_new_pack.AwtXgo/_old 2006-08-12 19:00:27.000000000 +0200 +++ /var/tmp/diff_new_pack.AwtXgo/_new 2006-08-12 19:00:27.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,11 +14,12 @@ BuildRequires: freetype2-devel giflib-devel libpng-devel libtiff-devel xorg-x11 xorg-x11-devel Summary: Imlib 2, the Successor to Imlib Version: 1.2.1 -Release: 5 +Release: 17 License: BSD Group: Development/Libraries/X11 Source: %name-%version.tar.gz Patch0: imlib2-1.2.1-fixes.patch +Patch1: imlib2-X11R6-xorg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.enlightenment.org/pages/imlib2.html Provides: imlib2-loader_jpeg imlib2-loader_png imlib2-loader_argb imlib2-loader_tiff imlib2-loader_gif imlib2-loader_zlib imlib2-loader_bz2 imlib2-loader_pnm imlib2-loader_bmp imlib2-loader_xpm imlib2-loader_tga @@ -95,12 +96,13 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %if %suse_version > 1000 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector" %endif -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS -DRGB_TXT_PATH=/usr/share/X11/rgb.txt" autoreconf --force --install %configure --prefix=%{_prefix} \ %ifarch %ix86 @@ -167,6 +169,9 @@ %attr(755,root,root) %{_libdir}/imlib2/loaders %changelog -n imlib2 +* Fri Aug 11 2006 - jw@suse.de +- RGB_TXT_PATH added to loader_xpm.c + defined now as /usr/share/X11/rgb.txt * Tue Feb 07 2006 - ro@suse.de - fix build for < 10.1 * Wed Jan 25 2006 - mls@suse.de ++++++ imlib2-X11R6-xorg.patch ++++++ --- imlib2-1.2.1/src/modules/loaders/loader_xpm.c.orig 2005-05-18 07:26:16.000000000 +0200 +++ imlib2-1.2.1/src/modules/loaders/loader_xpm.c 2006-08-11 15:37:18.000000000 +0200 @@ -65,8 +65,13 @@ } /* look in rgb txt database */ if (!rgb_txt) + +#ifndef RGB_TXT_PATH +# define RGB_TXT_PATH /usr/X11R6/lib/X11/rgb.txt +#endif +#define __QQ(a) #a #ifndef __EMX__ - rgb_txt = fopen("/usr/X11R6/lib/X11/rgb.txt", "r"); + rgb_txt = fopen(__QQ(RGB_TXT_PATH), "r"); #else rgb_txt = fopen(__XOS2RedirRoot("/XFree86/lib/X11/rgb.txt"), "rt"); #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...