commit iscan-free for openSUSE:Factory
Hello community, here is the log from the commit of package iscan-free for openSUSE:Factory checked in at Wed Jul 29 15:49:48 CEST 2009. -------- --- iscan-free/iscan-free.changes 2009-04-16 19:34:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/iscan-free/iscan-free.changes 2009-07-29 13:23:01.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 29 12:54:02 CEST 2009 - jsmeix@suse.de + +- fixes-for-GCC44-glibc_2.10.patch fixes GCC 4.4 and glibc 2.10 + issues, see http://udrepper.livejournal.com/20948.html + +------------------------------------------------------------------- @@ -4 +10,8 @@ -- remove static libraries and "la" files +- Removed static libraries and "la" files via "--disable-static" + in configure and '-type f -name "*.la" -exec ...__rm' + to enforce detection of other software which use + this stuff so that those other software could be fixed + (see also Novell/Suse Bugzilla bnc#509945). +- Replaced plain 'make' with '__make ... ?jobs:-j...jobs'. +- Use 'find_lang iscan' and 'files -f iscan.lang' instead of the + explicite file '_datadir/locale/*/LC_MESSAGES/iscan.mo'. @@ -9 +22,2 @@ -- Add some forward compatibility with libtool. +- Added some forward compatibility with libtool + via libltdl.patch and 'rm -f m4/libtool.m4'. @@ -205 +219 @@ -- Using '%triggerin -- sane' to add the 'epkowa' backend to +- Using 'triggerin -- sane' to add the 'epkowa' backend to @@ -212 +226 @@ -- Replaced '/usr/lib' by %{_libdir} to be prepared for 64-bit +- Replaced '/usr/lib' by _libdir to be prepared for 64-bit calling whatdependson for head-i586 New: ---- fixes-for-GCC44-glibc_2.10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iscan-free.spec ++++++ --- /var/tmp/diff_new_pack.hAY0m6/_old 2009-07-29 15:48:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hAY0m6/_new 2009-07-29 15:48:43.000000000 +0200 @@ -21,7 +21,7 @@ Name: iscan-free BuildRequires: db1-devel e2fsprogs-devel esound-devel gcc-c++ gdk-pixbuf-devel gimp-devel gnome-common libgphoto2-devel libjpeg-devel libxml-devel openssl-devel popt-devel sane-backends update-desktop-files Url: http://www.avasys.jp/english/linux_e/index.html -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Group: Hardware/Scanner AutoReqProv: on Summary: Free Image Scan Version with epkowa Driver for Epson Scanners @@ -47,13 +47,16 @@ Patch3: replace-HZ-by-sysconf_SC_CLK_TCK.patch # Patch4 applies fixes for GCC 4.3 (see http://en.opensuse.org/GCC_4.3_Transition): Patch4: fixes-for-GCC43.patch +# Patch5 fixes GCC 4.4 and glibc 2.10 issues, +# see http://udrepper.livejournal.com/20948.html +Patch5: fixes-for-GCC44-glibc_2.10.patch # Patch10 changes the "sane-epkowa" man page so that those models are removed # which require a non-free binary-only i386-only plugin. To determine those models use # egrep '^:model|^:comment' doc/epkowa.desc | grep -B1 'non-free' | grep '^:model' Patch10: adapt-man-for-free.patch # Have Epson Avasys' release number at the end of the SUSE package Version: Version: 2.10.0.1 -Release: 84 +Release: 85 # See the post and triggerin sections what is pre-required: PreReq: coreutils, /bin/grep, /bin/sed Requires: sane-backends @@ -81,6 +84,8 @@ %patch3 # Patch4 applies fixes for GCC 4.3: %patch4 +# Patch5 fixes GCC 4.4 and glibc 2.10 issues: +%patch5 # Remove those models from the man page which require a non-free plugin: %patch10 # Distinguish the no longer supported models in the description file @@ -105,7 +110,9 @@ # See /usr/lib/rpm/suse_macros regarding our RPM macros (e.g. sysconfdir is /etc). # enable-jpeg and enable-png is used in Epson Avasys' iscan.spec file. # By using disable-frontend it builds without the frontend (i.e. without the non-free stuff): -%configure --disable-static --with-pic --enable-jpeg \ +%configure --disable-static \ + --with-pic \ + --enable-jpeg \ --enable-png \ --disable-frontend %{__make} %{?jobs:-j%jobs} ++++++ fixes-for-GCC44-glibc_2.10.patch ++++++ --- lib/imgstream.cc.orig 2007-09-13 06:39:38.000000000 +0200 +++ lib/imgstream.cc 2009-07-29 12:40:28.000000000 +0200 @@ -183,8 +183,8 @@ imgstream::dlclose (dl_handle lib) return lt_dlclose (lib); } -static int reversionsort (const void*, const void*); -int selector (const dirent *); +static int reversionsort (const struct dirent **, const struct dirent **); +int selector (const struct dirent *); // forward declarations //! @@ -299,7 +299,7 @@ const char *imgstream::_libname = NULL; //! Selects relevant library filenames. int -selector (const dirent *dir) +selector (const struct dirent *dir) { return (0 == strncmp (dir->d_name, imgstream::_libname, strlen (imgstream::_libname))); @@ -308,7 +308,7 @@ selector (const dirent *dir) //! The C library's versionsort() function in reverse. static int -reversionsort (const void *a, const void *b) +reversionsort (const struct dirent **a, const struct dirent **b) { return versionsort (b, a); } --- frontend/file-selector.cc.orig 2007-09-13 06:39:36.000000000 +0200 +++ frontend/file-selector.cc 2009-07-29 12:49:36.000000000 +0200 @@ -1023,7 +1023,7 @@ file_selector::permission( const char *f // check write access to the directory (note that we need execute // privileges as well) - char *slash = strrchr( file, '/'); + char *slash = strrchr( (char *)file, '/'); *slash = '\0'; // temporarily truncate to dirname const char *dir = (file == slash ? "/" // whoops!, file in root directory ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de