March 2006 - openSUSE Commits - openSUSE Mailing Lists

commit glib2
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package glib2 checked in at Fri Mar 31 15:32:14 CEST 2006. -------- --- GNOME/glib2/glib2.changes 2006-01-27 03:04:47.000000000 +0100 +++ glib2/glib2.changes 2006-03-30 11:17:09.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 30 11:16:15 CEST 2006 - sbrabec(a)suse.cz + +- Renamed profile to be executed after lang.*, otherwise + G_FILENAME_ENCODING cannot be set. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.fjUx7R/_old 2006-03-31 15:31:43.000000000 +0200 +++ /var/tmp/diff_new_pack.fjUx7R/_new 2006-03-31 15:31:43.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 @@ -19,7 +19,7 @@ Autoreqprov: on Requires: gnome-filesystem Version: 2.8.5 -Release: 5 +Release: 14 Summary: A Library with Convenient Functions Written in C URL: http://www.gtk.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/glib/2.8/glib-%{version}.tar.bz2 @@ -147,8 +147,8 @@ export LIBRARY_PATH=$RPM_BUILD_ROOT/opt/gnome/lib make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/profile.d -cp -a %{S:1} $RPM_BUILD_ROOT/etc/profile.d -cp -a %{S:2} $RPM_BUILD_ROOT/etc/profile.d +cp -a %{S:1} $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.sh +cp -a %{S:2} $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.csh gzip -9nf $RPM_BUILD_ROOT%{prefix}/share/man/man?/*.? rm -rfv $RPM_BUILD_ROOT%{prefix}/share/locale/no %find_lang glib20 @@ -164,7 +164,7 @@ %defattr(-,root,root) %doc AUTHORS COPYING README NEWS ChangeLog %{prefix}/%_lib/lib*.so.* -/etc/profile.d/glib2.* +/etc/profile.d/zzz-glib2.* %files devel %defattr(-,root,root) @@ -184,6 +184,9 @@ %{prefix}/share/gtk-doc/html/gobject %changelog -n glib2 +* Thu Mar 30 2006 - sbrabec(a)suse.cz +- Renamed profile to be executed after lang.*, otherwise + G_FILENAME_ENCODING cannot be set. * Fri Jan 27 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Jan 18 2006 - gekker(a)suse.de ++++++ glib2.csh ++++++ --- GNOME/glib2/glib2.csh 2006-01-25 10:16:45.000000000 +0100 +++ glib2/glib2.csh 2006-03-30 11:30:41.000000000 +0200 @@ -1,6 +1,7 @@ # GLib filename encoding guesser. # Author: Stanislav Brabec <sbrabec(a)suse.cz> # Additions are welcome. +# This script must be executed after setting LANG variable. # Try filenames which are invalid in UTF-8 as locale specific. # For selected locales, G_FILENAME_ENCODING takes precedence. ++++++ glib2.sh ++++++ --- GNOME/glib2/glib2.sh 2006-01-25 10:16:44.000000000 +0100 +++ glib2/glib2.sh 2006-03-30 11:30:35.000000000 +0200 @@ -1,6 +1,7 @@ # GLib filename encoding guesser. # Author: Stanislav Brabec <sbrabec(a)suse.cz> # Additions are welcome. +# This script must be executed after setting LANG variable. # Try filenames which are invalid in UTF-8 as locale specific. # For selected locales, G_FILENAME_ENCODING takes precedence. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gcc
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package gcc checked in at Fri Mar 31 15:32:11 CEST 2006. -------- --- gcc/cross-alpha-gcc-icecream-backend.changes 2006-03-25 17:05:26.000000000 +0100 +++ gcc/cross-alpha-gcc-icecream-backend.changes 2006-03-30 18:49:29.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Mar 30 18:49:02 CEST 2006 - rguenther(a)suse.de + +- Fix #153386 in a different way. +- Add patch for PR26042. [#148884] + +------------------------------------------------------------------- +Mon Mar 27 13:59:33 CEST 2006 - rguenther(a)suse.de + +- Really fix #153386. + +------------------------------------------------------------------- cross-arm-gcc-icecream-backend.changes: same change cross-avr-gcc.changes: same change cross-hppa-gcc-icecream-backend.changes: same change cross-i386-gcc-icecream-backend.changes: same change cross-ia64-gcc-icecream-backend.changes: same change cross-mips-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-ppc64-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-sparc-gcc-icecream-backend.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc.changes: same change Old: ---- libjava-totalfix.patch New: ---- pr13212.patch pr26042.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-alpha-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.TvtwKd/_old 2006-03-31 15:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.TvtwKd/_new 2006-03-31 15:31:28.000000000 +0200 @@ -25,7 +25,7 @@ URL: http://gcc.gnu.org/ License: GPL, LGPL Version: 4.1.0 -Release: 9 +Release: 11 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %if %{gcc_for_opt} @@ -69,7 +69,8 @@ Patch75: pr26643.patch Patch77: pr25737.patch Patch79: pr26826.patch -Patch81: libjava-totalfix.patch +Patch82: pr13212.patch +Patch83: pr26042.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch53: gcc41-java-rmic.patch @@ -158,7 +159,8 @@ %patch75 %patch77 %patch79 -%patch81 +%patch82 +%patch83 %patch51 %patch53 %patch55 @@ -378,6 +380,11 @@ /usr/share/icecream-envs %changelog -n cross-alpha-gcc-icecream-backend +* Thu Mar 30 2006 - rguenther(a)suse.de +- Fix #153386 in a different way. +- Add patch for PR26042. [#148884] +* Mon Mar 27 2006 - rguenther(a)suse.de +- Really fix #153386. * Thu Mar 23 2006 - rguenther(a)suse.de - Update patch for PR26565. - Add patch for PR25737. cross-arm-gcc-icecream-backend.spec: same change ++++++ cross-avr-gcc.spec ++++++ --- /var/tmp/diff_new_pack.TvtwKd/_old 2006-03-31 15:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.TvtwKd/_new 2006-03-31 15:31:28.000000000 +0200 @@ -24,7 +24,7 @@ URL: http://gcc.gnu.org/ License: GPL, LGPL Version: 4.1.0 -Release: 9 +Release: 11 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %if %{gcc_for_opt} @@ -68,7 +68,8 @@ Patch75: pr26643.patch Patch77: pr25737.patch Patch79: pr26826.patch -Patch81: libjava-totalfix.patch +Patch82: pr13212.patch +Patch83: pr26042.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch53: gcc41-java-rmic.patch @@ -154,7 +155,8 @@ %patch75 %patch77 %patch79 -%patch81 +%patch82 +%patch83 %patch51 %patch53 %patch55 @@ -341,6 +343,11 @@ %{_prefix} %changelog -n cross-avr-gcc +* Thu Mar 30 2006 - rguenther(a)suse.de +- Fix #153386 in a different way. +- Add patch for PR26042. [#148884] +* Mon Mar 27 2006 - rguenther(a)suse.de +- Really fix #153386. * Thu Mar 23 2006 - rguenther(a)suse.de - Update patch for PR26565. - Add patch for PR25737. ++++++ cross-hppa-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.TvtwKd/_old 2006-03-31 15:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.TvtwKd/_new 2006-03-31 15:31:28.000000000 +0200 @@ -25,7 +25,7 @@ URL: http://gcc.gnu.org/ License: GPL, LGPL Version: 4.1.0 -Release: 9 +Release: 11 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %if %{gcc_for_opt} @@ -69,7 +69,8 @@ Patch75: pr26643.patch Patch77: pr25737.patch Patch79: pr26826.patch -Patch81: libjava-totalfix.patch +Patch82: pr13212.patch +Patch83: pr26042.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch53: gcc41-java-rmic.patch @@ -158,7 +159,8 @@ %patch75 %patch77 %patch79 -%patch81 +%patch82 +%patch83 %patch51 %patch53 %patch55 @@ -378,6 +380,11 @@ /usr/share/icecream-envs %changelog -n cross-hppa-gcc-icecream-backend +* Thu Mar 30 2006 - rguenther(a)suse.de +- Fix #153386 in a different way. +- Add patch for PR26042. [#148884] +* Mon Mar 27 2006 - rguenther(a)suse.de +- Really fix #153386. * Thu Mar 23 2006 - rguenther(a)suse.de - Update patch for PR26565. - Add patch for PR25737. cross-i386-gcc-icecream-backend.spec: same change cross-ia64-gcc-icecream-backend.spec: same change cross-ppc-gcc-icecream-backend.spec: same change cross-ppc64-gcc-icecream-backend.spec: same change cross-s390-gcc-icecream-backend.spec: same change cross-s390x-gcc-icecream-backend.spec: same change cross-x86_64-gcc-icecream-backend.spec: same change ++++++ gcc.spec ++++++ --- /var/tmp/diff_new_pack.TvtwKd/_old 2006-03-31 15:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.TvtwKd/_new 2006-03-31 15:31:28.000000000 +0200 @@ -85,7 +85,7 @@ URL: http://gcc.gnu.org/ License: GPL Version: 4.1.0 -Release: 9 +Release: 11 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %if %{gcc_for_opt} @@ -131,7 +131,8 @@ Patch75: pr26643.patch Patch77: pr25737.patch Patch79: pr26826.patch -Patch81: libjava-totalfix.patch +Patch82: pr13212.patch +Patch83: pr26042.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch53: gcc41-java-rmic.patch @@ -581,7 +582,8 @@ %patch75 %patch77 %patch79 -%patch81 +%patch82 +%patch83 %patch51 %patch53 %patch55 @@ -1714,6 +1716,11 @@ %endif %changelog -n gcc +* Thu Mar 30 2006 - rguenther(a)suse.de +- Fix #153386 in a different way. +- Add patch for PR26042. [#148884] +* Mon Mar 27 2006 - rguenther(a)suse.de +- Really fix #153386. * Thu Mar 23 2006 - rguenther(a)suse.de - Update patch for PR26565. - Add patch for PR25737. ++++++ gcc.spec.in ++++++ --- gcc/gcc.spec.in 2006-03-25 17:01:59.000000000 +0100 +++ gcc/gcc.spec.in 2006-03-31 09:35:45.000000000 +0200 @@ -149,7 +149,8 @@ Patch75: pr26643.patch Patch77: pr25737.patch Patch79: pr26826.patch -Patch81: libjava-totalfix.patch +Patch82: pr13212.patch +Patch83: pr26042.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch53: gcc41-java-rmic.patch @@ -515,7 +516,8 @@ %patch75 %patch77 %patch79 -%patch81 +%patch82 +%patch83 %patch51 %patch53 %patch55 ++++++ pr13212.patch ++++++ 2006-03-29 Bryce McKinlay <mckinlay(a)redhat.com> PR libgcj/13212: * configure.ac: Check for pthread_getattr_np(). Remove GC_PTHREAD_SYM_VERSION detection. * include/gc.h (GC_register_my_thread, GC_unregister_my_thread, GC_get_thread_stack_base): New declarations. * pthread_support.c (GC_register_my_thread, GC_unregister_my_thread, GC_get_thread_stack_base): New functions. (GC_delete_thread): Don't try to free the first_thread. * misc.c (GC_init_inner): Use GC_get_thread_stack_base() if possible. (pthread_create_, constr): Removed. (pthread_create): Don't rename. * include/gc_ext_config.h.in: Rebuilt. * include/gc_pthread_redirects.h (pthread_create): Define unconditionally. * include/gc_config.h.in: Rebuilt. * configure: Rebuilt. Index: libjava/boehm.cc =================================================================== --- libjava/boehm.cc (revision 112312) +++ libjava/boehm.cc (working copy) @@ -713,3 +713,15 @@ // For now, always reclaim soft references. FIXME. return true; } + +void +_Jv_GCAttachThread () +{ + GC_register_my_thread (); +} + +void +_Jv_GCDetachThread () +{ + GC_unregister_my_thread (); +} Index: libjava/java/lang/natThread.cc =================================================================== --- libjava/java/lang/natThread.cc (revision 112312) +++ libjava/java/lang/natThread.cc (working copy) @@ -396,7 +396,8 @@ } // Attach the current native thread to an existing (but unstarted) Thread -// object. Returns -1 on failure, 0 upon success. +// object. Does not register thread with the garbage collector. +// Returns -1 on failure, 0 upon success. jint _Jv_AttachCurrentThread(java::lang::Thread* thread) { @@ -413,6 +414,8 @@ java::lang::Thread* _Jv_AttachCurrentThread(jstring name, java::lang::ThreadGroup* group) { + // Register thread with GC before attempting any allocations. + _Jv_GCAttachThread (); java::lang::Thread *thread = _Jv_ThreadCurrent (); if (thread != NULL) return thread; @@ -447,6 +450,7 @@ return -1; _Jv_ThreadUnRegister (); + _Jv_GCDetachThread (); // Release the monitors. t->finish_ (); Index: libjava/include/boehm-gc.h =================================================================== --- libjava/include/boehm-gc.h (revision 112312) +++ libjava/include/boehm-gc.h (working copy) @@ -79,6 +79,12 @@ #endif /* LIBGCJ_GC_DEBUG */ +void +_Jv_GCAttachThread (); + +void +_Jv_GCDetachThread (); + // _Jv_AllocBytes (jsize size) should go here, too. But clients don't // usually include this header. Index: boehm-gc/configure.ac =================================================================== --- boehm-gc/configure.ac (revision 112312) +++ boehm-gc/configure.ac (working copy) @@ -291,6 +291,13 @@ ;; esac +# Checks for pthreads functions +# +oldLIBS="$LIBS" +LIBS="$LIBS -lpthread" +AC_CHECK_FUNCS([pthread_getattr_np]) +LIBS="$oldLIBS" + # Configuration of machine-dependent code # # We don't set NO_EXECUTE_PERMISSION by default because gcj (and @@ -450,25 +457,6 @@ AC_DEFINE(USE_MMAP, 1, [use MMAP instead of sbrk to get new memory]) fi -symver= -case "$target" in - *-*-linux* ) - cat > conftest.c <<EOF -#include <pthread.h> -void *tf (void *arg) { (void) arg; return NULL; } -int main (void) { pthread_t th; pthread_create (&th, NULL, tf, NULL); return 0; } -EOF - if $CC $CFLAGS -pthread -o conftest conftest.c > /dev/null 2>&1; then - symver=`readelf -s conftest 2> /dev/null | sed -n '/UND pthread_create@/{s/^.*@//;s/ .*$//;p;q}'` - fi - rm -f conftest conftest.c - ;; -esac -if test -n "$symver"; then - AC_DEFINE_UNQUOTED(GC_PTHREAD_SYM_VERSION, "$symver", [symbol version of pthread_create]) -fi - - if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then toolexecdir='$(exec_prefix)/$(target_noncanonical)' Index: boehm-gc/include/gc.h =================================================================== --- boehm-gc/include/gc.h (revision 112312) +++ boehm-gc/include/gc.h (working copy) @@ -69,7 +69,6 @@ extern "C" { # endif - /* Define word and signed_word to be unsigned and signed types of the */ /* size as char * or void *. There seems to be no way to do this */ /* even semi-portably. The following is probably no better/worse */ @@ -909,6 +908,25 @@ # if defined(PCR) || defined(GC_SOLARIS_THREADS) || \ defined(GC_PTHREADS) || defined(GC_WIN32_THREADS) /* Any flavor of threads except SRC_M3. */ + +/* Register the current thread as a new thread whose stack(s) should */ +/* be traced by the GC. */ +/* If a platform does not implicitly do so, this must be called before */ +/* a thread can allocate garbage collected memory, or assign pointers */ +/* to the garbage collected heap. Once registered, a thread will be */ +/* stopped during garbage collections. */ +GC_API void GC_register_my_thread GC_PROTO((void)); + +/* Register the current thread, with the indicated stack base, as */ +/* a new thread whose stack(s) should be traced by the GC. If a */ +/* platform does not implicitly do so, this must be called before a */ +/* thread can allocate garbage collected memory, or assign pointers */ +/* to the garbage collected heap. Once registered, a thread will be */ +/* stopped during garbage collections. */ +GC_API void GC_unregister_my_thread GC_PROTO((void)); + +GC_API GC_PTR GC_get_thread_stack_base GC_PROTO((void)); + /* This returns a list of objects, linked through their first */ /* word. Its use can greatly reduce lock contention problems, since */ /* the allocation lock can be acquired and released many fewer times. */ Index: boehm-gc/include/gc_ext_config.h.in =================================================================== --- boehm-gc/include/gc_ext_config.h.in (revision 112312) +++ boehm-gc/include/gc_ext_config.h.in (working copy) @@ -3,5 +3,3 @@ is used by libjava/include/boehm-gc.h. */ #undef THREAD_LOCAL_ALLOC - -#undef GC_PTHREAD_SYM_VERSION Index: boehm-gc/include/gc_pthread_redirects.h =================================================================== --- boehm-gc/include/gc_pthread_redirects.h (revision 112312) +++ boehm-gc/include/gc_pthread_redirects.h (working copy) @@ -68,9 +68,7 @@ # undef pthread_detach #endif -#ifndef GC_PTHREAD_SYM_VERSION # define pthread_create GC_pthread_create -#endif # define pthread_join GC_pthread_join # define pthread_detach GC_pthread_detach Index: boehm-gc/include/gc_config.h.in =================================================================== --- boehm-gc/include/gc_config.h.in (revision 112312) +++ boehm-gc/include/gc_config.h.in (working copy) @@ -45,9 +45,6 @@ /* support for Tru64 pthreads */ #undef GC_OSF1_THREADS -/* symbol version of pthread_create */ -#undef GC_PTHREAD_SYM_VERSION - /* support for Solaris pthreads */ #undef GC_SOLARIS_PTHREADS @@ -63,6 +60,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the `pthread_getattr_np' function. */ +#undef HAVE_PTHREAD_GETATTR_NP + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H Index: boehm-gc/ChangeLog =================================================================== --- boehm-gc/ChangeLog (revision 112312) +++ boehm-gc/ChangeLog (working copy) @@ -1,3 +1,22 @@ +2006-03-29 Bryce McKinlay <mckinlay(a)redhat.com> + + PR libgcj/13212: + * configure.ac: Check for pthread_getattr_np(). Remove + GC_PTHREAD_SYM_VERSION detection. + * include/gc.h (GC_register_my_thread, GC_unregister_my_thread, + GC_get_thread_stack_base): New declarations. + * pthread_support.c (GC_register_my_thread, GC_unregister_my_thread, + GC_get_thread_stack_base): New functions. + (GC_delete_thread): Don't try to free the first_thread. + * misc.c (GC_init_inner): Use GC_get_thread_stack_base() if possible. + (pthread_create_, constr): Removed. + (pthread_create): Don't rename. + * include/gc_ext_config.h.in: Rebuilt. + * include/gc_pthread_redirects.h (pthread_create): Define + unconditionally. + * include/gc_config.h.in: Rebuilt. + * configure: Rebuilt. + 2006-02-28 Release Manager * GCC 4.1.0 released. Index: boehm-gc/configure =================================================================== --- boehm-gc/configure (revision 112312) +++ boehm-gc/configure (working copy) @@ -5759,6 +5759,119 @@ ;; esac +# Checks for pthreads functions +# +oldLIBS="$LIBS" +LIBS="$LIBS -lpthread" + +for ac_func in pthread_getattr_np +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 +echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } +fi +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +LIBS="$oldLIBS" + # Configuration of machine-dependent code # # We don't set NO_EXECUTE_PERMISSION by default because gcj (and @@ -6627,29 +6740,6 @@ fi -symver= -case "$target" in - *-*-linux* ) - cat > conftest.c <<EOF -#include <pthread.h> -void *tf (void *arg) { (void) arg; return NULL; } -int main (void) { pthread_t th; pthread_create (&th, NULL, tf, NULL); return 0; } -EOF - if $CC $CFLAGS -pthread -o conftest conftest.c > /dev/null 2>&1; then - symver=`readelf -s conftest 2> /dev/null | sed -n '/UND pthread_create@/{s/^.*@//;s/ .*$//;p;q}'` - fi - rm -f conftest conftest.c - ;; -esac -if test -n "$symver"; then - -cat >>confdefs.h <<_ACEOF -#define GC_PTHREAD_SYM_VERSION "$symver" -_ACEOF - -fi - - if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then toolexecdir='$(exec_prefix)/$(target_noncanonical)' Index: boehm-gc/pthread_support.c =================================================================== --- boehm-gc/pthread_support.c (revision 112312) +++ boehm-gc/pthread_support.c (working copy) @@ -602,7 +602,9 @@ } else { prev -> next = p -> next; } - GC_INTERNAL_FREE(p); + + if (p != &first_thread) + GC_INTERNAL_FREE(p); } /* If a thread has been joined, but we have not yet */ @@ -1125,6 +1127,107 @@ GC_bool GC_in_thread_creation = FALSE; +GC_PTR GC_get_thread_stack_base() +{ +# ifdef HAVE_PTHREAD_GETATTR_NP + pthread_t my_pthread; + pthread_attr_t attr; + ptr_t stack_addr; + size_t stack_size; + + my_pthread = pthread_self(); + pthread_getattr_np (my_pthread, &attr); + pthread_attr_getstack (&attr, (void **) &stack_addr, &stack_size); + pthread_attr_destroy (&attr); + +# ifdef DEBUG_THREADS + GC_printf1("attached thread stack address: 0x%x\n", stack_addr); +# endif + +# ifdef STACK_GROWS_DOWN + return stack_addr + stack_size; +# else + return stack_addr - stack_size; +# endif + +# else +# ifdef DEBUG_THREADS + GC_printf1("Can not determine stack base for attached thread"); +# endif + return 0; +# endif +} + +void GC_register_my_thread() +{ + GC_thread me; + pthread_t my_pthread; + + my_pthread = pthread_self(); +# ifdef DEBUG_THREADS + GC_printf1("Attaching thread 0x%lx\n", my_pthread); + GC_printf1("pid = %ld\n", (long) getpid()); +# endif + + /* Check to ensure this thread isn't attached already. */ + LOCK(); + me = GC_lookup_thread (my_pthread); + UNLOCK(); + if (me != 0) + { +# ifdef DEBUG_THREADS + GC_printf1("Attempt to re-attach known thread 0x%lx\n", my_pthread); +# endif + return; + } + + LOCK(); + GC_in_thread_creation = TRUE; + me = GC_new_thread(my_pthread); + GC_in_thread_creation = FALSE; + + me -> flags |= DETACHED; + +#ifdef GC_DARWIN_THREADS + me -> stop_info.mach_thread = mach_thread_self(); +#else + me -> stack_end = GC_get_thread_stack_base(); + if (me -> stack_end == 0) + GC_abort("Can not determine stack base for attached thread"); + +# ifdef STACK_GROWS_DOWN + me -> stop_info.stack_ptr = me -> stack_end - 0x10; +# else + me -> stop_info.stack_ptr = me -> stack_end + 0x10; +# endif +#endif + +# ifdef IA64 + me -> backing_store_end = (ptr_t) + (GC_save_regs_in_stack() & ~(GC_page_size - 1)); + /* This is also < 100% convincing. We should also read this */ + /* from /proc, but the hook to do so isn't there yet. */ +# endif /* IA64 */ + +# if defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL) + GC_init_thread_local(me); +# endif + UNLOCK(); +} + +void GC_unregister_my_thread() +{ + pthread_t my_pthread; + + my_pthread = pthread_self(); + +# ifdef DEBUG_THREADS + GC_printf1("Detaching thread 0x%lx\n", my_pthread); +# endif + + GC_thread_exit_proc (0); +} + void * GC_start_routine(void * arg) { int dummy; @@ -1201,37 +1304,8 @@ return(result); } -#ifdef GC_PTHREAD_SYM_VERSION - -/* Force constr to execute prior to main(). */ -static void constr (void) __attribute__ ((constructor)); - -static int -(*pthread_create_)(pthread_t *new_thread, - const pthread_attr_t *attr_in, - void * (*thread_execp)(void *), void *arg); - -static void -constr (void) -{ - /* Get a pointer to the real pthread_create. */ - pthread_create_ = dlvsym (RTLD_NEXT, "pthread_create", - GC_PTHREAD_SYM_VERSION); -} - -#define GC_PTHREAD_CREATE_NAME pthread_create -#define GC_PTHREAD_REAL_NAME (*pthread_create_) - -#else - -#define GC_PTHREAD_CREATE_NAME WRAP_FUNC(pthread_create) -#define GC_PTHREAD_REAL_NAME REAL_FUNC(pthread_create) - -#endif - - int -GC_PTHREAD_CREATE_NAME(pthread_t *new_thread, +WRAP_FUNC(pthread_create)(pthread_t *new_thread, const pthread_attr_t *attr, void *(*start_routine)(void *), void *arg) { @@ -1286,7 +1360,7 @@ pthread_self()); # endif - result = GC_PTHREAD_REAL_NAME(new_thread, attr, GC_start_routine, si); + result = REAL_FUNC(pthread_create)(new_thread, attr, GC_start_routine, si); # ifdef DEBUG_THREADS GC_printf1("Started thread 0x%X\n", *new_thread); Index: boehm-gc/misc.c =================================================================== --- boehm-gc/misc.c (revision 112312) +++ boehm-gc/misc.c (working copy) @@ -674,7 +674,13 @@ # if !defined(THREADS) || defined(GC_PTHREADS) || defined(GC_WIN32_THREADS) \ || defined(GC_SOLARIS_THREADS) if (GC_stackbottom == 0) { - GC_stackbottom = GC_get_stack_base(); + # ifdef GC_PTHREADS + /* Use thread_stack_base if available, as GC could be initialized from + a thread that is not the "main" thread. */ + GC_stackbottom = GC_get_thread_stack_base(); + # endif + if (GC_stackbottom == 0) + GC_stackbottom = GC_get_stack_base(); # if (defined(LINUX) || defined(HPUX)) && defined(IA64) GC_register_stackbottom = GC_get_register_stack_base(); # endif ++++++ pr26042.patch ++++++ 2006-03-30 Tom Tromey <tromey(a)redhat.com> PR java/26042: * parse.y (java_reorder_fields): Reset superclass field's size as well. Index: gcc/java/parse.y =================================================================== *** gcc/java/parse.y (revision 112539) --- gcc/java/parse.y (revision 112540) *************** java_reorder_fields (void) *** 7770,7775 **** --- 7770,7779 ---- if (!DECL_NAME (TYPE_FIELDS (current_class))) { tree fields = TYPE_FIELDS (current_class); + /* This works around a problem where on some platforms, + the field might be given its size incorrectly. */ + DECL_SIZE (fields) = NULL_TREE; + DECL_SIZE_UNIT (fields) = NULL_TREE; TREE_CHAIN (fields) = nreverse (TREE_CHAIN (fields)); TYPE_SIZE (current_class) = NULL_TREE; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gfxboot
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package gfxboot checked in at Fri Mar 31 15:31:38 CEST 2006. -------- --- arch/i386/gfxboot/gfxboot.changes 2006-03-29 16:35:23.000000000 +0200 +++ gfxboot/gfxboot.changes 2006-03-31 15:02:54.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Mar 31 15:02:49 CEST 2006 - snwint(a)suse.de + +- added 'share' input field for smb install +- some more texts are translatable +- Live-CD preparations + +------------------------------------------------------------------- +Thu Mar 30 17:07:01 CEST 2006 - snwint(a)suse.de + +- adjusted 640x480 fallback layout +- added driver update dialog that lets you enter the update file name + +------------------------------------------------------------------- Old: ---- gfxboot-3.2.18.tar.bz2 New: ---- gfxboot-3.2.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.eONSla/_old 2006-03-31 15:31:20.000000000 +0200 +++ /var/tmp/diff_new_pack.eONSla/_new 2006-03-31 15:31:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gfxboot (Version 3.2.18) +# spec file for package gfxboot (Version 3.2.20) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,10 +17,10 @@ Obsoletes: gfxboot-devel Autoreqprov: on Summary: Graphical Boot Logo for LILO and SYSLINUX -Version: 3.2.18 +Version: 3.2.20 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-3.2.18.tar.bz2 +Source: gfxboot-3.2.20.tar.bz2 Source1: NLD.tar.bz2 Source2: SLES.tar.bz2 Source3: SuSE.tar.bz2 @@ -58,6 +58,13 @@ /usr/share/gfxboot %changelog -n gfxboot +* Fri Mar 31 2006 - snwint(a)suse.de +- added 'share' input field for smb install +- some more texts are translatable +- Live-CD preparations +* Thu Mar 30 2006 - snwint(a)suse.de +- adjusted 640x480 fallback layout +- added driver update dialog that lets you enter the update file name * Wed Mar 29 2006 - snwint(a)suse.de - better 'welcome' screen * Tue Mar 28 2006 - snwint(a)suse.de ++++++ NLD.tar.bz2 ++++++ ++++++ SLES.tar.bz2 ++++++ ++++++ SuSE.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/boot.config new/themes/SuSE/boot.config --- old/themes/SuSE/boot.config 2005-09-02 16:29:54.000000000 +0200 +++ new/themes/SuSE/boot.config 2006-03-31 14:15:53.000000000 +0200 @@ -1,7 +1,5 @@ %% include system.inc -/livecd false def - % no splash /bsplash.show { } def /bsplash.done { } def diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/common.inc new/themes/SuSE/common.inc --- old/themes/SuSE/common.inc 2006-03-28 14:51:46.000000000 +0200 +++ new/themes/SuSE/common.inc 2006-03-31 14:45:13.000000000 +0200 @@ -66,7 +66,7 @@ % /enough_mem { biosmem 4 20 shl lt - biosmem 200 20 shl ge or + biosmem livecd.mem.check 20 shl ge or syslinux not or } def @@ -427,9 +427,15 @@ } if xmenu.dud { - dud.options xmenu.dud .xm_current get get dup "" ne { - "%s " bc.cmd dup length add sprintf - } { pop } ifelse + xmenu.dud .xm_current get .dud_file eq { + input.edit.dud_file 0 get dup "" ne { + "driverupdate=%s " bc.cmd dup length add sprintf + } { pop } ifelse + } { + dud.options xmenu.dud .xm_current get get dup "" ne { + "%s " bc.cmd dup length add sprintf + } { pop } ifelse + } ifelse } if xmenu.profile { @@ -1011,6 +1017,8 @@ dup "failsafe" eq { pop "LiveCD - Safe Settings" return } if dup "linux2" eq { pop "SUSE Linux 10.1 LiveCD (deutsch)" return } if dup "failsaf2" eq { pop "LiveCD - Sichere Einstellungen" return } if + dup "kde" eq { pop "LiveCD - KDE" return } if + dup "gnome" eq { pop "LiveCD - GNOME" return } if } { dup "linux" eq { pop txt_install return } if dup "failsafe" eq { pop txt_safe_install return } if @@ -1151,19 +1159,6 @@ /init { 0 0 moveto currentpoint clip.size image - ptheme { - /head.x 31 def - /head.y 23 def - } { - small_layout { - /head.x 31 def - /head.y 23 def - } { - /head.x -15 def - /head.y -30 def - } ifelse - } ifelse - ptheme { ptheme.init } if % set default language @@ -1200,8 +1195,8 @@ /menu.bar.color white def small_layout { - /frame1.pos { 250 150 } def - /frame1.width 365 def + /frame1.pos { 120 110 } def + /frame1.width 400 def } { /frame1.pos { 200 192 } def /frame1.width 400 def @@ -1225,7 +1220,7 @@ /boot.buf.size cmdlinelength def /boot.buf boot.buf.size string def - % no boot options line initially + % false: no boot options line initially /boot.show true def /update.pos { @@ -1466,7 +1461,9 @@ dup .title "Cool computer, but..." put dup .text - "Sorry, but SUSE Linux 10.1 LiveCD needs at least 256MB main memory." + livecd.mem.show + "Sorry, but SUSE Linux 10.1 LiveCD needs at least %dMB main memory." + dup length 32 add string dup 4 1 roll sprintf put dup .buttons [ button.reboot button.default actReboot actNoClose or button.setaction @@ -1586,7 +1583,7 @@ /debug 0 def -ptheme small_layout or { +ptheme small_layout or CapsLock or { /bsplash.done { } def } { bsplash.show diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/dia_dud.inc new/themes/SuSE/dia_dud.inc --- old/themes/SuSE/dia_dud.inc 2006-02-28 14:51:53.000000000 +0100 +++ new/themes/SuSE/dia_dud.inc 2006-03-31 13:33:14.000000000 +0200 @@ -8,11 +8,16 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Some global vars. % -/dud.default 1 def +/.dud_yes 0 def +/.dud_no 1 def +/.dud_file 2 def + +/dud.default .dud_no def /dud.options [ "dud=1" "" + .undef ] def @@ -27,7 +32,7 @@ /xmenu xmenu.dud def xmenu .xm_current dud.default put - xmenu .xm_list [ "Yes" "No" ] put + xmenu .xm_list [ /txt_yes /txt_no /txt_file ] put xmenu .xm_title /txt_driver_update put @@ -43,7 +48,11 @@ /dud.update { /xmenu xmenu.dud def - /window.action actRedrawPanel def + xmenu .xm_current get dup .dud_file eq { + dud.dialog + } { + /window.action actRedrawPanel def + } ifelse pmenu.update } def @@ -89,3 +98,48 @@ } def +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +/dud.dialog { + + /dia window.dialog def + + dia .text "" put + + xmenu .xm_current get + + dup .dud_file eq { + input.edit.dud_file .undef eq { + /input.edit.dud_file [ 127 string ] def + } if + + dia .title "Driver Update" put + + % Must all be of same size! + dia .ed.list 1 array put + dia .ed.buffer.list input.edit.dud_file put + dia .ed.text.list [ + +"To load driver updates directly from CD-ROM, +enter the driver update file names (separated +by commas ',') here:\n" + + ] put + + } if + + pop + + dia .ed.focus 0 put + dia .ed.width 300 put + + dia .buttons [ + button.ok button.default actNothing button.setaction + button.cancel button.notdefault actNothing button.setaction + ] put + + dia window.init + dia window.show + +} def + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/dia_install.inc new/themes/SuSE/dia_install.inc --- old/themes/SuSE/dia_install.inc 2005-11-25 15:14:32.000000000 +0100 +++ new/themes/SuSE/dia_install.inc 2006-03-31 14:02:14.000000000 +0200 @@ -182,18 +182,18 @@ dup .inst_smb eq { input.edit.smb .undef eq { - /input.edit.smb [ 63 string 127 string 31 string 31 string 31 string ] def + /input.edit.smb [ 63 string 31 string 127 string 31 string 31 string 31 string ] def } if dia .title txt_smb_title put % Must all be of same size! - dia .ed.list 5 array put + dia .ed.list 6 array put dia .ed.buffer.list input.edit.smb put - dia .ed.text.list [ txt_server txt_directory txt_domain txt_user2 txt_password ] put + dia .ed.text.list [ txt_server txt_share txt_directory txt_domain txt_user2 txt_password ] put dia .ed.font font.normal put - dia .ed.pw_field 4 put + dia .ed.pw_field 5 put } if @@ -271,20 +271,22 @@ "install=smb://" install.option sprintf % add domain - dup 2 get "" ne { - dup 2 get "%s;" install.option dup length add sprintf + dup 3 get "" ne { + dup 3 get "%s;" install.option dup length add sprintf } if % add user name & password - dup 3 get "" ne { - dup 3 get "%s" install.option dup length add sprintf - dup 4 get "" ne { - dup 4 get ":%s" install.option dup length add sprintf + dup 4 get "" ne { + dup 4 get "%s" install.option dup length add sprintf + dup 5 get "" ne { + dup 5 get ":%s" install.option dup length add sprintf } if "@" install.option dup length add sprintf } if - dup 1 get exch 0 get "%s/%s" install.option dup length add sprintf + dup 2 get dup 0 get '/' eq { 1 add } if + over 1 get rot 0 get + "%s/%s/%s" install.option dup length add sprintf } if pop diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/install.config new/themes/SuSE/install.config --- old/themes/SuSE/install.config 2006-02-28 15:05:40.000000000 +0100 +++ new/themes/SuSE/install.config 2006-03-31 14:15:58.000000000 +0200 @@ -1,8 +1,6 @@ %% include system.inc %% include bsplash.inc -/livecd false def - %% include timeout.inc %% include common.inc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/panel.inc new/themes/SuSE/panel.inc --- old/themes/SuSE/panel.inc 2006-03-13 14:48:10.000000000 +0100 +++ new/themes/SuSE/panel.inc 2006-03-31 14:14:00.000000000 +0200 @@ -42,6 +42,7 @@ [ keyF2 0 "F2" /panel.video /panel.video.width /panel.video.update /video.init ] [ keyF3 0 "F3" /panel.splash /panel.splash.width /panel.splash.update /splash.init ] + [ keyF4 0 "F4" /panel.lang /panel.lang.width /panel.lang.update /lang.init ] } { @@ -61,10 +62,10 @@ } if } if - xmenu.bits .undef eq { bits.init } if - } ifelse + xmenu.bits .undef eq { bits.init } if + } { [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ] @@ -97,6 +98,7 @@ panel.penguin } { %% include panel.default + CapsLock { pop panel.full } if } ifelse def } { /panel.short [ @@ -189,6 +191,9 @@ % only for install CDs syslinux not { return } if + % not for live cd + livecd { return } if + % not for F1 dup keyF1 eq { return } if diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/bg.po new/themes/SuSE/po/bg.po --- old/themes/SuSE/po/bg.po 2006-03-06 17:24:32.000000000 +0100 +++ new/themes/SuSE/po/bg.po 2006-03-31 14:01:45.000000000 +0200 @@ -289,3 +289,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Да" + +#. txt_no +msgid "No" +msgstr "Не" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/bin/add_text new/themes/SuSE/po/bin/add_text --- old/themes/SuSE/po/bin/add_text 2004-03-14 18:10:11.000000000 +0100 +++ new/themes/SuSE/po/bin/add_text 2006-03-31 13:41:18.000000000 +0200 @@ -46,7 +46,9 @@ print "ok\n"; for $f ("bootloader.pot", <*.po>) { - if(open F, ">>$f") { + if(open F, "+<$f") { + @f = <F>; + print F "\n" if $f[-1] !~ /^\s*$/; print F @l; close F; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/bootloader.pot new/themes/SuSE/po/bootloader.pot --- old/themes/SuSE/po/bootloader.pot 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/bootloader.pot 2006-03-31 14:01:45.000000000 +0200 @@ -255,3 +255,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "" + +#. txt_no +msgid "No" +msgstr "" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/cs.po new/themes/SuSE/po/cs.po --- old/themes/SuSE/po/cs.po 2006-03-27 15:38:06.000000000 +0200 +++ new/themes/SuSE/po/cs.po 2006-03-31 14:01:45.000000000 +0200 @@ -15,7 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" # ok button label #. txt_ok @@ -288,3 +289,21 @@ msgid "Installation--Local APIC Disabled" msgstr "Instalace -- bez local APIC" +#. txt_yes +msgid "Yes" +msgstr "Ano" + +#. txt_no +msgid "No" +msgstr "Ne" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/da.po new/themes/SuSE/po/da.po --- old/themes/SuSE/po/da.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/da.po 2006-03-31 14:01:45.000000000 +0200 @@ -286,3 +286,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Ja" + +#. txt_no +msgid "No" +msgstr "Nej" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/de.po new/themes/SuSE/po/de.po --- old/themes/SuSE/po/de.po 2006-03-06 11:51:27.000000000 +0100 +++ new/themes/SuSE/po/de.po 2006-03-31 14:01:45.000000000 +0200 @@ -286,3 +286,21 @@ msgid "Installation--Local APIC Disabled" msgstr "Installation - Lokaler APIC deaktiviert" +#. txt_yes +msgid "Yes" +msgstr "Ja" + +#. txt_no +msgid "No" +msgstr "Nein" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "Datei" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/el.po new/themes/SuSE/po/el.po --- old/themes/SuSE/po/el.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/el.po 2006-03-31 14:01:45.000000000 +0200 @@ -287,3 +287,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Ναι" + +#. txt_no +msgid "No" +msgstr "Όχι" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/es.po new/themes/SuSE/po/es.po --- old/themes/SuSE/po/es.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/es.po 2006-03-31 14:01:45.000000000 +0200 @@ -287,3 +287,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Sí" + +#. txt_no +msgid "No" +msgstr "No" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/fi.po new/themes/SuSE/po/fi.po --- old/themes/SuSE/po/fi.po 2006-03-27 15:51:47.000000000 +0200 +++ new/themes/SuSE/po/fi.po 2006-03-31 14:01:45.000000000 +0200 @@ -288,3 +288,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Kyllä" + +#. txt_no +msgid "No" +msgstr "Ei" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/fr.po new/themes/SuSE/po/fr.po --- old/themes/SuSE/po/fr.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/fr.po 2006-03-31 14:01:45.000000000 +0200 @@ -291,3 +291,23 @@ msgid "Installation--Local APIC Disabled" msgstr "" +# TLABEL linuxrc_2002_03_29_0036__2 +#. txt_yes +msgid "Yes" +msgstr "Oui" + +# TLABEL linuxrc_2002_03_29_0036__3 +#. txt_no +msgid "No" +msgstr "Non" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/hu.po new/themes/SuSE/po/hu.po --- old/themes/SuSE/po/hu.po 2006-03-27 15:47:42.000000000 +0200 +++ new/themes/SuSE/po/hu.po 2006-03-31 14:01:45.000000000 +0200 @@ -292,3 +292,21 @@ msgid "Installation--Local APIC Disabled" msgstr "Telepítés - Local APIC támogatás nélkül" +#. txt_yes +msgid "Yes" +msgstr "Igen" + +#. txt_no +msgid "No" +msgstr "Nem" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/it.po new/themes/SuSE/po/it.po --- old/themes/SuSE/po/it.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/it.po 2006-03-31 14:01:45.000000000 +0200 @@ -286,3 +286,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Sì" + +#. txt_no +msgid "No" +msgstr "No" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/ja.po new/themes/SuSE/po/ja.po --- old/themes/SuSE/po/ja.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/ja.po 2006-03-31 14:01:45.000000000 +0200 @@ -281,3 +281,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "はい" + +#. txt_no +msgid "No" +msgstr "いいえ" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/lt.po new/themes/SuSE/po/lt.po --- old/themes/SuSE/po/lt.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/lt.po 2006-03-31 14:01:45.000000000 +0200 @@ -283,3 +283,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "" + +#. txt_no +msgid "No" +msgstr "" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/nb.po new/themes/SuSE/po/nb.po --- old/themes/SuSE/po/nb.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/nb.po 2006-03-31 14:01:45.000000000 +0200 @@ -288,3 +288,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Ja" + +#. txt_no +msgid "No" +msgstr "Nei" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/nl.po new/themes/SuSE/po/nl.po --- old/themes/SuSE/po/nl.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/nl.po 2006-03-31 14:01:45.000000000 +0200 @@ -289,3 +289,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Ja" + +#. txt_no +msgid "No" +msgstr "Nee" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/pl.po new/themes/SuSE/po/pl.po --- old/themes/SuSE/po/pl.po 2006-03-27 15:47:37.000000000 +0200 +++ new/themes/SuSE/po/pl.po 2006-03-31 14:01:45.000000000 +0200 @@ -286,3 +286,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Tak" + +#. txt_no +msgid "No" +msgstr "Nie" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/pt.po new/themes/SuSE/po/pt.po --- old/themes/SuSE/po/pt.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/pt.po 2006-03-31 14:01:45.000000000 +0200 @@ -286,3 +286,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Sim" + +#. txt_no +msgid "No" +msgstr "Não" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/pt_BR.po new/themes/SuSE/po/pt_BR.po --- old/themes/SuSE/po/pt_BR.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/pt_BR.po 2006-03-31 14:01:45.000000000 +0200 @@ -282,3 +282,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Sim" + +#. txt_no +msgid "No" +msgstr "Não" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/ro.po new/themes/SuSE/po/ro.po --- old/themes/SuSE/po/ro.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/ro.po 2006-03-31 14:01:45.000000000 +0200 @@ -276,10 +276,9 @@ msgid "Other Options" msgstr "" -# label for language selection #. txt_language msgid "Language" -msgstr "" +msgstr "Limba" #. txt_apic msgid "Installation--IOAPIC Enabled" @@ -293,3 +292,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Da" + +#. txt_no +msgid "No" +msgstr "Nu" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/ru.po new/themes/SuSE/po/ru.po --- old/themes/SuSE/po/ru.po 2006-03-06 17:22:33.000000000 +0100 +++ new/themes/SuSE/po/ru.po 2006-03-31 14:01:45.000000000 +0200 @@ -289,3 +289,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Да" + +#. txt_no +msgid "No" +msgstr "Нет" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/sk.po new/themes/SuSE/po/sk.po --- old/themes/SuSE/po/sk.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/sk.po 2006-03-31 14:01:45.000000000 +0200 @@ -280,10 +280,9 @@ msgid "Other Options" msgstr "" -# label for language selection #. txt_language msgid "Language" -msgstr "" +msgstr "Jazyk" #. txt_apic msgid "Installation--IOAPIC Enabled" @@ -297,3 +296,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Áno" + +#. txt_no +msgid "No" +msgstr "Nie" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/sl.po new/themes/SuSE/po/sl.po --- old/themes/SuSE/po/sl.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/sl.po 2006-03-31 14:01:45.000000000 +0200 @@ -290,3 +290,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Da" + +#. txt_no +msgid "No" +msgstr "Ne" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/sr.po new/themes/SuSE/po/sr.po --- old/themes/SuSE/po/sr.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/sr.po 2006-03-31 14:01:45.000000000 +0200 @@ -283,3 +283,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "" + +#. txt_no +msgid "No" +msgstr "" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/sv.po new/themes/SuSE/po/sv.po --- old/themes/SuSE/po/sv.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/sv.po 2006-03-31 14:01:45.000000000 +0200 @@ -286,3 +286,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Ja" + +#. txt_no +msgid "No" +msgstr "Nej" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/uk.po new/themes/SuSE/po/uk.po --- old/themes/SuSE/po/uk.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/uk.po 2006-03-31 14:01:45.000000000 +0200 @@ -288,3 +288,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "Так" + +#. txt_no +msgid "No" +msgstr "Ні" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/zh_CN.po new/themes/SuSE/po/zh_CN.po --- old/themes/SuSE/po/zh_CN.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/zh_CN.po 2006-03-31 14:01:45.000000000 +0200 @@ -282,3 +282,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "是" + +#. txt_no +msgid "No" +msgstr "否" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/zh_TW.po new/themes/SuSE/po/zh_TW.po --- old/themes/SuSE/po/zh_TW.po 2006-03-06 11:50:37.000000000 +0100 +++ new/themes/SuSE/po/zh_TW.po 2006-03-31 14:01:45.000000000 +0200 @@ -282,3 +282,21 @@ msgid "Installation--Local APIC Disabled" msgstr "" +#. txt_yes +msgid "Yes" +msgstr "是" + +#. txt_no +msgid "No" +msgstr "否" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/system.inc new/themes/SuSE/system.inc --- old/themes/SuSE/system.inc 2006-02-09 15:56:55.000000000 +0100 +++ new/themes/SuSE/system.inc 2006-03-31 14:38:21.000000000 +0200 @@ -78,6 +78,8 @@ /statusCtrl 0x0104 def /statusShift 0x0003 def +/CapsLock { 0x417 cvp getbyte 0x40 and 0 ne } def + % boot loader % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -281,6 +283,25 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Convert object to number. +% +% ( obj ) ==> ( int ) +% +/cvn { + dup gettype t_string eq { + 0 exch + { + '0' sub + dup 0 lt over 9 gt or { pop exit } if + exch 10 mul add + } forall + } { + t_int settype + } ifelse +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Arguments like snprintf. % % ( obj_1 ... obj_n string_1 string_2 ) ==> ( ) @@ -514,7 +535,7 @@ gfxconfig.data { - % overkill because string compare does not honour eotchar + % overkill because string compare does not honor eotchar dup strdup dup 5 index eq { dup length exch free 1 add add exch pop exit } { @@ -763,3 +784,33 @@ } def +% Test whether we run in Live-CD mode +% +% ( -- true|false ) +% +/livecd { + /livecd "livecd" getgfxconfig dup .undef ne { 0 ne } { pop false } ifelse def + livecd +} def + + +% Mininum Live-CD memory in MB. +% +% ( -- int ) +% +/livecd.mem.check { + /livecd.mem.check "livecd.mem.check" getgfxconfig dup .undef ne { cvn } { pop 200 } ifelse def + livecd.mem.check +} def + + +% Mininum Live-CD memory in MB we ask the user for. +% +% ( -- int ) +% +/livecd.mem.show { + /livecd.mem.show "livecd.mem.show" getgfxconfig dup .undef ne { cvn } { pop 256 } ifelse def + livecd.mem.show +} def + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/window.inc new/themes/SuSE/window.inc --- old/themes/SuSE/window.inc 2005-08-28 17:32:21.000000000 +0200 +++ new/themes/SuSE/window.inc 2006-03-31 12:27:07.000000000 +0200 @@ -482,7 +482,7 @@ /dialog.height window.buttons 0 get 3 get dialog.button.y add 8 add def } if } if - /dialog.y screen.size exch pop dialog.tmp .position get mul 10 div dialog.height sub 2 div def + /dialog.y screen.size exch pop dialog.tmp .position get mul 10 div dialog.height sub 2 div 10 max def window.buttons .undef ne { window.buttons length { 10 ++++++ gfxboot-3.2.18.tar.bz2 -> gfxboot-3.2.20.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.18/Changelog new/gfxboot-3.2.20/Changelog --- old/gfxboot-3.2.18/Changelog 2006-03-29 16:30:39.000000000 +0200 +++ new/gfxboot-3.2.20/Changelog 2006-03-31 14:47:28.000000000 +0200 @@ -1,3 +1,12 @@ +31/3/2006: v3.2.20 + - added 'share' input field for smb install + - some more texts are translatable + - Live-CD preparations + +30/3/2006: v3.2.19 + - adjusted 640x480 fallback layout + - added driver update dialog that lets you enter the update file name + 29/3/2006: v3.2.18 - better 'welcome' screen diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.18/VERSION new/gfxboot-3.2.20/VERSION --- old/gfxboot-3.2.18/VERSION 2006-03-29 16:30:20.000000000 +0200 +++ new/gfxboot-3.2.20/VERSION 2006-03-31 13:57:05.000000000 +0200 @@ -1 +1 @@ -3.2.18 +3.2.20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit fontconfig
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package fontconfig checked in at Fri Mar 31 15:31:13 CEST 2006. -------- --- fontconfig/fontconfig.changes 2006-03-24 11:35:20.000000000 +0100 +++ fontconfig/fontconfig.changes 2006-03-31 11:30:30.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Mar 31 11:28:47 CEST 2006 - zsu(a)suse.de + +- Bugzilla #158573: Hinting will be done before Embolden in + freetype2, but in such case, Embolden will get wrong result + on some glyph contours after applying hinting. + Actually, hinting should be done after embolden, but we can't + fix it in current freetype2. So as a workaround, just turn off + hinting if we want to do embolden. + +------------------------------------------------------------------- New: ---- bugzilla-158573-turn-off-hinting-when-embolden.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontconfig.spec ++++++ --- /var/tmp/diff_new_pack.00mGqX/_old 2006-03-31 15:30:41.000000000 +0200 +++ /var/tmp/diff_new_pack.00mGqX/_new 2006-03-31 15:30:41.000000000 +0200 @@ -18,7 +18,7 @@ URL: http://fontconfig.org/ Autoreqprov: on Version: 2.3.94 -Release: 5 +Release: 6 Summary: Library for Font Configuration # CVS can be found here: # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login @@ -58,6 +58,7 @@ Patch18: fc-validatecache-option.diff Patch22: fc-verbose.diff Patch27: fc-app-dir-fix-new-new.diff +Patch28: bugzilla-158573-turn-off-hinting-when-embolden.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -103,6 +104,7 @@ %patch18 -p0 #%patch22 -p1 %patch27 -p1 +%patch28 -p0 %build %define myprefix /usr @@ -192,6 +194,13 @@ %{myprefix}/include/fontconfig/ %changelog -n fontconfig +* Fri Mar 31 2006 - zsu(a)suse.de +- Bugzilla #158573: Hinting will be done before Embolden in + freetype2, but in such case, Embolden will get wrong result + on some glyph contours after applying hinting. + Actually, hinting should be done after embolden, but we can't + fix it in current freetype2. So as a workaround, just turn off + hinting if we want to do embolden. * Fri Mar 24 2006 - mfabian(a)suse.de - Bugzilla #160226: When alternately starting a 32 bit and 64 bit application on a 64 bit system, ~/.fonts.cache-2 was always ++++++ bugzilla-158573-turn-off-hinting-when-embolden.patch ++++++ --- fonts.conf.in.old 2006-03-31 17:15:40.000000000 +0800 +++ fonts.conf.in 2006-03-31 17:24:05.000000000 +0800 @@ -392,6 +392,17 @@ <edit name="weight" mode="assign"> <const>bold</const> </edit> +  + <edit name="hintstyle" mode="assign"> + <const>hintnone</const> + </edit> </match> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit evolution
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package evolution checked in at Fri Mar 31 15:30:37 CEST 2006. -------- --- GNOME/evolution/evolution.changes 2006-03-27 20:24:45.000000000 +0200 +++ evolution/evolution.changes 2006-03-29 15:47:52.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 15:45:04 CEST 2006 - dgollub(a)suse.de + +- removed pilot-link 0.12.0 API patch from spec file. + downgrade to pilot-link version 0.11.8 - see 161722 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.DufJdo/_old 2006-03-31 15:30:25.000000000 +0200 +++ /var/tmp/diff_new_pack.DufJdo/_new 2006-03-31 15:30:25.000000000 +0200 @@ -21,7 +21,7 @@ Autoreqprov: on Obsoletes: bonobo-conf Version: 2.6.0 -Release: 11 +Release: 14 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.6/%{name}-%{version}.tar.… Source1: summerdance-about2.png @@ -288,7 +288,7 @@ %patch17 #%patch18 %if %suse_version > 1000 -%patch19 -p1 +#%patch19 -p1 downgrade to pilot-link 0.11.8 - see #161722 %endif %patch20 -p0 %patch23 -p0 @@ -438,6 +438,9 @@ %{prefix}/share/gnome-pilot/conduits/*.conduit %changelog -n evolution +* Wed Mar 29 2006 - dgollub(a)suse.de +- removed pilot-link 0.12.0 API patch from spec file. + downgrade to pilot-link version 0.11.8 - see 161722 * Mon Mar 27 2006 - vvaradhan(a)novell.com - Fixes (bnc) 160049 changed G/W password - no calendar prompt ... ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dicts
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package dicts checked in at Fri Mar 31 15:30:33 CEST 2006. -------- --- dicts/dicts.changes 2006-01-25 21:35:29.000000000 +0100 +++ dicts/dicts.changes 2006-03-29 16:19:28.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 16:09:33 CEST 2006 - werner(a)suse.de + +- Add locale provides (bug #161478) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dicts.spec ++++++ --- /var/tmp/diff_new_pack.nOT8q9/_old 2006-03-31 15:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nOT8q9/_new 2006-03-31 15:29:54.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package dicts (Version 1.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # 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://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ Group: Productivity/Text/Spell Autoreqprov: on Version: 1.5 -Release: 246 +Release: 253 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Ispell Dictionary Files # @@ -99,7 +99,7 @@ for Estonian (already compiled for ispell in package ispell-estonian) -Please read the README's under /usr/src/dicts. +Read the READMEs under /usr/src/dicts. @@ -130,12 +130,12 @@ %package -n ispell-german Summary: German ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary igerman +Provides: ispell_dictionary igerman locale(ispell:de;de_DE) Obsoletes: igerman Autoreqprov: on %description -n ispell-german -This packages includes a ready german dictionary for ispell. A short +This packages includes a ready German dictionary for ispell. A short usage description is given in /usr/share/doc/packages/ispell/README of the packages ispell. The sources for this dictionary are included in the package dicts. @@ -150,7 +150,7 @@ License: GPL, Other License(s), see package Summary: New Swiss ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary inswiss +Provides: ispell_dictionary inswiss locale(ispell:de;de_CH) Obsoletes: inswiss Autoreqprov: on @@ -172,7 +172,7 @@ License: GPL, Other License(s), see package Summary: New German ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary ingerman +Provides: ispell_dictionary ingerman locale(ispell:de;de_DE) Obsoletes: ingerman Autoreqprov: on @@ -193,7 +193,7 @@ %package -n ispell-danish Summary: Danish ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary idanish +Provides: ispell_dictionary idanish locale(ispell:da) Obsoletes: idanish Autoreqprov: on @@ -212,7 +212,7 @@ %package -n ispell-spanish Summary: Spanish ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary ispanish +Provides: ispell_dictionary ispanish locale(ispell:es;an_ES) Obsoletes: ispanish Autoreqprov: on @@ -232,7 +232,7 @@ %package -n ispell-french Summary: French ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary ifrench +Provides: ispell_dictionary ifrench locale(ispell:fr;br_FR) Obsoletes: ifrench Conflicts: ispell-french-gutenberg Autoreqprov: on @@ -250,7 +250,7 @@ %package -n ispell-italian Summary: Italian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary iitalian +Provides: ispell_dictionary iitalian locale(ispell:it) Obsoletes: iitalian Autoreqprov: on @@ -269,7 +269,7 @@ %package -n ispell-dutch Summary: Dutch ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary idutch +Provides: ispell_dictionary idutch locale(ispell:nl) Obsoletes: idutch Autoreqprov: on @@ -288,7 +288,7 @@ %package -n ispell-swedish Summary: Swedish ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary iswedish +Provides: ispell_dictionary iswedish locale(ispell:sv) Obsoletes: iswedish Autoreqprov: on @@ -307,7 +307,7 @@ %package -n ispell-norsk Summary: Norwegian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary inorsk +Provides: ispell_dictionary inorsk locale(ispell:nb;nn;no;se_NO) Obsoletes: inorsk Autoreqprov: on @@ -326,7 +326,7 @@ %package -n ispell-portuguese Summary: Portuguese ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary iportug +Provides: ispell_dictionary iportug locale(ispell:pt;pt_PT) Obsoletes: iportug Autoreqprov: on @@ -345,7 +345,7 @@ %package -n ispell-catalan Summary: Catalan ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary icatalan +Provides: ispell_dictionary icatalan locale(ispell:ca) Obsoletes: icatalan Autoreqprov: on @@ -364,7 +364,7 @@ %package -n ispell-czech Summary: Czech ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary iczech +Provides: ispell_dictionary iczech locale(ispell:cs;sk) Obsoletes: iczech Autoreqprov: on @@ -386,7 +386,7 @@ %package -n ispell-polish Summary: Polish ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary ipolish +Provides: ispell_dictionary ipolish locale(ispell:pl) Obsoletes: ipolish Autoreqprov: on @@ -406,7 +406,7 @@ %package -n ispell-greek Summary: Greek ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary igreek +Provides: ispell_dictionary igreek locale(ispell:el) Obsoletes: igreek Autoreqprov: on @@ -421,7 +421,7 @@ %package -n ispell-russian Summary: Russian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary irussian +Provides: ispell_dictionary irussian locale(ispell:ru) Obsoletes: irussian Autoreqprov: on @@ -459,12 +459,12 @@ %package -n ispell-slovene Summary: Slovenian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary islovene +Provides: ispell_dictionary islovene locale(ispell:sl;sk) Obsoletes: islovene Autoreqprov: on %description -n ispell-slovene -This packages includes a ready sloveniandictionary for ispell. A short +This packages includes a ready slovenian dictionary for ispell. A short usage description is given in /usr/share/doc/packages/ispell/README of the packages ispell. The sources for this dictionary are included in the package dicts. @@ -478,7 +478,7 @@ %package -n ispell-brazilian Summary: Brazilian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary +Provides: ispell_dictionary locale(ispell:pt_BR;pt) Autoreqprov: on %description -n ispell-brazilian @@ -496,7 +496,7 @@ %package -n ispell-finnish Summary: Finnish ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary +Provides: ispell_dictionary locale(ispell:fi) Autoreqprov: on %description -n ispell-finnish @@ -515,7 +515,7 @@ %package -n ispell-estonian Summary: Estonian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary +Provides: ispell_dictionary locale(ispell:et) Autoreqprov: on %description -n ispell-estonian @@ -727,6 +727,8 @@ %doc /usr/share/doc/packages/dicts/ %changelog -n dicts +* Wed Mar 29 2006 - werner(a)suse.de +- Add locale provides (bug #161478) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Jul 01 2005 - werner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dia
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package dia checked in at Fri Mar 31 15:29:57 CEST 2006. -------- --- GNOME/dia/dia.changes 2006-02-24 13:55:33.000000000 +0100 +++ dia/dia.changes 2006-03-30 17:27:07.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 30 17:26:12 CEST 2006 - sbrabec(a)suse.cz + +- Fixed XFig import buffer overflows (#162074). + http://mail.gnome.org/archives/dia-list/2006-March/msg00149.html + +------------------------------------------------------------------- New: ---- dia-xfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.UmIcdE/_old 2006-03-31 15:29:35.000000000 +0200 +++ /var/tmp/diff_new_pack.UmIcdE/_new 2006-03-31 15:29:35.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A Diagram Creation Program Version: 0.94 -Release: 27 +Release: 33 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/dia-%{version}.tar.bz2 Source1: font-test-japanese.dia Source2: font-test-czech.dia @@ -32,6 +32,7 @@ Patch7: dia-cairo-0.5.patch Patch8: dia-group-props-size.patch Patch9: dia-can-2005-2966.patch +Patch10: dia-xfig.patch URL: http://www.gnome.org/projects/dia/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,6 +67,9 @@ %patch7 %patch8 %patch9 +cd plug-ins/xfig +%patch10 +cd ../.. gnome-patch-translation-update cp $RPM_SOURCE_DIR/font-test*dia . @@ -110,6 +114,9 @@ %prefix/share/pixmaps/* %changelog -n dia +* Thu Mar 30 2006 - sbrabec(a)suse.cz +- Fixed XFig import buffer overflows (#162074). + http://mail.gnome.org/archives/dia-list/2006-March/msg00149.html * Fri Feb 24 2006 - sbrabec(a)suse.cz - Improved Categories. * Wed Feb 15 2006 - stbinner(a)suse.de ++++++ dia-xfig.patch ++++++ diff -u /tmp/dia-0.94/plug-ins/xfig/xfig.h ./xfig.h --- /tmp/dia-0.94/plug-ins/xfig/xfig.h 2004-08-16 09:56:21.000000000 +0200 +++ ./xfig.h 2006-03-29 21:40:15.000000000 +0200 @@ -6,6 +6,7 @@ #define FIG_MAX_DEFAULT_COLORS 32 #define FIG_MAX_USER_COLORS 512 +#define FIG_MAX_DEPTHS 1000 /* 1200 PPI */ #define FIG_UNIT 472.440944881889763779527559055118 /* 1/80 inch */ diff -u /tmp/dia-0.94/plug-ins/xfig/xfig-import.c ./xfig-import.c --- /tmp/dia-0.94/plug-ins/xfig/xfig-import.c 2004-08-16 09:56:21.000000000 +0200 +++ ./xfig-import.c 2006-03-29 21:40:21.000000000 +0200 @@ -441,11 +441,17 @@ static Color fig_color(int color_index) { - if (color_index == -1) + if (color_index <= -1) return color_black; /* Default color */ - if (color_index < FIG_MAX_DEFAULT_COLORS) + else if (color_index < FIG_MAX_DEFAULT_COLORS) return fig_default_colors[color_index]; - else return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; + else if (color_index < FIG_MAX_USER_COLORS) + return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; + else { + message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."), + color_index); + return color_black; + } } static Color @@ -563,23 +569,25 @@ static int fig_read_n_points(FILE *file, int n, Point **points) { int i; - Point *new_points; - - new_points = (Point*)g_malloc(sizeof(Point)*n); + GArray *points_list = g_array_sized_new(FALSE, FALSE, sizeof(Point), n); for (i = 0; i < n; i++) { int x,y; + Point p; if (fscanf(file, " %d %d ", &x, &y) != 2) { message_error(_("Error while reading %dth of %d points: %s\n"), i, n, strerror(errno)); - free(new_points); + g_array_free(points_list, TRUE); return FALSE; } - new_points[i].x = x/FIG_UNIT; - new_points[i].y = y/FIG_UNIT; + p.x = x/FIG_UNIT; + p.y = y/FIG_UNIT; + g_array_append_val(points_list, p); } fscanf(file, "\n"); - *points = new_points; + + *points = (Point *)points_list->data; + g_array_free(points_list, FALSE); return TRUE; } @@ -683,7 +691,7 @@ return text_buf; } -static GList *depths[1000]; +static GList *depths[FIG_MAX_DEPTHS]; /* If there's something in the compound stack, we ignore the depth field, as it will be determined by the group anyway */ @@ -693,6 +701,26 @@ level. Best we can do now. */ static int compound_depth; +/** Add an object at a given depth. This function checks for depth limits + * and updates the compound depth if needed. + * + * @param newobj An object to add. If we're inside a compound, this + * doesn't really add the object. + * @param depth A depth as in the Fig format, max 999 + */ +static void +add_at_depth(DiaObject *newobj, int depth) { + if (depth < 0 || depth >= FIG_MAX_DEPTHS) { + message_error(_("Depth %d of of range, only 0-%d allowed.\n"), + depth, FIG_MAX_DEPTHS-1); + depth = FIG_MAX_DEPTHS - 1; + } + if (compound_stack == NULL) + depths[depth] = g_list_append(depths[depth], newobj); + else + if (compound_depth > depth) compound_depth = depth; +} + static DiaObject * fig_read_ellipse(FILE *file, DiagramData *dia) { int sub_type; @@ -749,10 +777,7 @@ /* Angle -- can't rotate yet */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); return newobj; } @@ -885,10 +910,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: prop_list_free(props); g_free(forward_arrow_info); @@ -1111,10 +1133,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: prop_list_free(props); g_free(forward_arrow_info); @@ -1202,10 +1221,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: g_free(forward_arrow_info); @@ -1298,10 +1314,7 @@ newobj->ops->set_props(newobj, props); /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: if (text_buf != NULL) free(text_buf); @@ -1347,6 +1360,12 @@ return FALSE; } + if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) { + message_error(_("Color number %d out of range 0..%d. Discarding color.\n"), + colornumber, FIG_MAX_USER_COLORS); + return FALSE; + } + color.red = ((colorvalues & 0x00ff0000)>>16) / 255.0; color.green = ((colorvalues & 0x0000ff00)>>8) / 255.0; color.blue = (colorvalues & 0x000000ff) / 255.0; @@ -1393,7 +1412,7 @@ } /* Group extends don't really matter */ if (compound_stack == NULL) - compound_depth = 999; + compound_depth = FIG_MAX_DEPTHS - 1; compound_stack = g_slist_append(compound_stack, NULL); return TRUE; break; @@ -1551,7 +1570,7 @@ for (i = 0; i < FIG_MAX_USER_COLORS; i++) { fig_colors[i] = color_black; } - for (i = 0; i < 1000; i++) { + for (i = 0; i < FIG_MAX_DEPTHS; i++) { depths[i] = NULL; } @@ -1606,7 +1625,7 @@ } while (TRUE); /* Now we can reorder for the depth fields */ - for (i = 0; i < 1000; i++) { + for (i = 0; i < FIG_MAX_DEPTHS; i++) { if (depths[i] != NULL) layer_add_objects_first(dia->active_layer, depths[i]); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dhcp
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package dhcp checked in at Fri Mar 31 15:29:42 CEST 2006. -------- --- dhcp/dhcp.changes 2006-01-27 01:11:32.000000000 +0100 +++ dhcp/dhcp.changes 2006-03-29 15:48:09.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Mar 29 15:47:38 CEST 2006 - poeml(a)suse.de + +- fix two further include paths in dhcpctl.3 and omapi.3 + +------------------------------------------------------------------- +Wed Mar 29 12:50:24 CEST 2006 - poeml(a)suse.de + +- package the static libdst.a library [#158271] +- fix the include path in dhcpctl.3 and omapi.3 [#158271] + +------------------------------------------------------------------- New: ---- dhcp-3.0.3-man.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.QytYgq/_old 2006-03-31 15:29:12.000000000 +0200 +++ /var/tmp/diff_new_pack.QytYgq/_new 2006-03-31 15:29:12.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 @@ -16,7 +16,7 @@ Group: Productivity/Networking/Boot/Servers Autoreqprov: on Version: 3.0.3 -Release: 8 +Release: 15 Summary: Common Files Used by ISC DHCP Software URL: http://www.isc.org/isc/dhcp.html Source: dhcp-%{version}.tar.bz2 @@ -52,8 +52,10 @@ Patch32: dhclient.c.dif ## duplicate stdin, stdout and stderr for dhclient childs Patch40: dhcp-3.0rc10.filedes.dif +## other stuff Patch41: makefile.diff Patch51: dhcp-3.0.1rc14-tmpfile.dif +Patch52: dhcp-3.0.3-man.dif ## LDAP support for DHCP server ## patch lives here: http://home.ntelos.net/~masneyb/ %define DHCPD_LDAP 1 @@ -188,6 +190,7 @@ %patch40 %patch41 %patch51 -p1 +%patch52 -p1 %if %DHCPD_LDAP %patch60 -p1 %endif @@ -240,6 +243,7 @@ rm -rf $RPM_BUILD_ROOT MANDIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} make install install -m 744 work.linux-2.2/omapip/svtest $RPM_BUILD_ROOT/usr/sbin/svtest +install -m 644 work.linux-2.2/dst/libdst.a $RPM_BUILD_ROOT/%{_libdir} # install the saved bsd flavor binary install -m 755 work.linux-2.2/server/dhcpd.bsd $RPM_BUILD_ROOT/usr/sbin/dhcpd.bsd mkdir -p $RPM_BUILD_ROOT/etc/init.d @@ -481,6 +485,11 @@ %doc %{_mandir}/man3/dhcpctl.3.gz %changelog -n dhcp +* Wed Mar 29 2006 - poeml(a)suse.de +- fix two further include paths in dhcpctl.3 and omapi.3 +* Wed Mar 29 2006 - poeml(a)suse.de +- package the static libdst.a library [#158271] +- fix the include path in dhcpctl.3 and omapi.3 [#158271] * Fri Jan 27 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Jan 25 2006 - poeml(a)suse.de ++++++ dhcp-3.0.3-man.dif ++++++ diff -uNr dhcp-3.0.3.orig/dhcpctl/dhcpctl.3 dhcp-3.0.3/dhcpctl/dhcpctl.3 --- dhcp-3.0.3.orig/dhcpctl/dhcpctl.3 2004-09-24 23:08:38.000000000 +0200 +++ dhcp-3.0.3/dhcpctl/dhcpctl.3 2006-03-29 15:46:13.281689267 +0200 @@ -425,8 +425,8 @@ #include <stdio.h> #include <netinet/in.h> -#include <isc/result.h> -#include <dhcpctl/dhcpctl.h> +#include <isc-dhcp/result.h> +#include <dhcpctl.h> int main (int argc, char **argv) { dhcpctl_data_string ipaddrstring = NULL; diff -uNr dhcp-3.0.3.orig/omapip/omapi.3 dhcp-3.0.3/omapip/omapi.3 --- dhcp-3.0.3.orig/omapip/omapi.3 2004-09-24 23:08:38.000000000 +0200 +++ dhcp-3.0.3/omapip/omapi.3 2006-03-29 15:46:57.128056679 +0200 @@ -87,8 +87,8 @@ #include <stdio.h> #include <netinet/in.h> - #include <isc/result.h> - #include <dhcpctl/dhcpctl.h> + #include <isc-dhcp/result.h> + #include <dhcpctl.h> int main (int argc, char **argv) { dhcpctl_data_string ipaddrstring = NULL; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit bitchx
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package bitchx checked in at Fri Mar 31 15:29:29 CEST 2006. -------- --- bitchx/bitchx.changes 2006-01-25 21:34:38.000000000 +0100 +++ bitchx/bitchx.changes 2006-03-29 21:29:17.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Mar 29 21:21:23 CEST 2006 - lmichnovic(a)suse.cz + +- fixed calling of different function that caused crashing on 64bit + arch, needed for 32bit too [#157927] (not_in_display.patch) +- fixed cast to pointer from integer of different size on 64bit arch + (pointer_casting_64.patch) + +------------------------------------------------------------------- +Thu Mar 16 21:16:37 CET 2006 - lmichnovic(a)suse.cz + +- creation of manpage fixed in mandir.patch + +------------------------------------------------------------------- +Thu Mar 16 19:21:04 CET 2006 - lmichnovic(a)suse.cz + +- fixed missing debuginfo.rpm + +------------------------------------------------------------------- Old: ---- BitchX-64bit.patch BitchX-gcc34.patch BitchX-non_static_decl.patch BitchX-overflow.patch bitchx-configs.dif New: ---- bitchx-64bit.patch bitchx-configs.patch bitchx-gcc34.patch bitchx-mandir.patch bitchx-non_static_decl.patch bitchx-not_in_display.patch bitchx-overflow.patch bitchx-pointer_casting_64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bitchx.spec ++++++ --- /var/tmp/diff_new_pack.zOXSQ7/_old 2006-03-31 15:28:40.000000000 +0200 +++ /var/tmp/diff_new_pack.zOXSQ7/_new 2006-03-31 15:28:40.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package bitchx (Version 1.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # 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://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -19,16 +19,18 @@ Summary: An IRC Client URL: http://www.bitchx.org/ Version: 1.1 -Release: 7 +Release: 15 Source: ircii-pana-%{version}-final.tar.bz2 -Patch0: bitchx-configs.dif +Patch0: bitchx-configs.patch Patch1: bitchx-conf.patch -Patch3: BitchX-64bit.patch -Patch4: BitchX-gcc34.patch -Patch5: BitchX-non_static_decl.patch -Patch6: BitchX-overflow.patch +Patch3: bitchx-64bit.patch +Patch4: bitchx-gcc34.patch +Patch5: bitchx-non_static_decl.patch +Patch6: bitchx-overflow.patch +Patch7: bitchx-mandir.patch +Patch8: bitchx-not_in_display.patch +Patch9: bitchx-pointer_casting_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Nosource: 0 %description BitchX is one of the most well-known IRC clients for the text console. @@ -49,7 +51,10 @@ %patch4 -p1 %patch5 %patch6 -p1 -gzip -c9 < doc/BitchX.1 > BitchX.1.gz +%patch7 +%patch8 +%patch9 +#gzip -c9 < doc/BitchX.1 > BitchX.1.gz rm -rf macros/sanity.m4 %build @@ -61,12 +66,16 @@ --mandir=%{_mandir} \ --enable-ipv6 \ --with-ssl -make +make %{?jobs:-j%jobs} %install make prefix=$RPM_BUILD_ROOT/usr/ install ln -sf BitchX-%{version}-final $RPM_BUILD_ROOT/usr/bin/BitchX -install -D -m 644 BitchX.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/BitchX.1.gz +pushd $RPM_BUILD_ROOT/%{_mandir}/man1/ +gzip -c9 < BitchX.1 > BitchX.1.gz +popd +#install -D -m 644 BitchX.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/BitchX.1.gz +pwd ln -s BitchX.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/bitchx.1.gz ln -s BitchX $RPM_BUILD_ROOT/usr/bin/bitchx chmod 0644 $RPM_BUILD_ROOT/usr/lib/bx/help/findcomm.bz2 @@ -77,7 +86,7 @@ %files %defattr(-,root,root) %doc BitchX.help BitchX.ircnames BitchX.quit BitchX.reasons -%doc COMPILE-PROBLEMS Changelog INSTALL README INSTALL +%doc COMPILE-PROBLEMS Changelog INSTALL README %doc doc/* %doc %{_mandir}/man1/BitchX.1.gz %doc %{_mandir}/man1/bitchx.1.gz @@ -88,6 +97,15 @@ /usr/lib/bx/ %changelog -n bitchx +* Wed Mar 29 2006 - lmichnovic(a)suse.cz +- fixed calling of different function that caused crashing on 64bit + arch, needed for 32bit too [#157927] (not_in_display.patch) +- fixed cast to pointer from integer of different size on 64bit arch + (pointer_casting_64.patch) +* Thu Mar 16 2006 - lmichnovic(a)suse.cz +- creation of manpage fixed in mandir.patch +* Thu Mar 16 2006 - lmichnovic(a)suse.cz +- fixed missing debuginfo.rpm * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Sep 05 2005 - pnemec(a)suse.cz ++++++ bitchx-64bit.patch ++++++ --- BitchX/include/module.h +++ BitchX/include/module.h @@ -15,7 +15,7 @@ #include "struct.h" -typedef int (*Function_ptr)(); +typedef long (*Function_ptr)(); #ifdef WANT_DLL #ifdef HPUX --- BitchX/include/modval.h +++ BitchX/include/modval.h @@ -318,7 +318,7 @@ #define show_window(x) ((void) (global[SHOW_WINDOW]((Window *)x))) #define get_status_by_refnum(x, y) ((char *) (global[GET_STATUS_BY_REFNUM]((unsigned int)x, (unsigned int)y))) #define get_visible_by_refnum(x) ((int) (global[GET_VISIBLE_BY_REFNUM]((char *)x))) -#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned int)x))) +#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned long)x))) #define get_window_by_refnum(x) ((Window *) (global[GET_WINDOW_BY_REFNUM]((unsigned int)x))) #define get_window_by_name(x) ((Window *) (global[GET_WINDOW_BY_NAME]((char *)x))) #define next_window(x, y) ((void) (global[FUNC_NEXT_WINDOW]((char)x, (char *)y))) ++++++ bitchx-conf.patch ++++++ --- /var/tmp/diff_new_pack.zOXSQ7/_old 2006-03-31 15:28:40.000000000 +0200 +++ /var/tmp/diff_new_pack.zOXSQ7/_new 2006-03-31 15:28:40.000000000 +0200 @@ -1,6 +1,6 @@ --- configure.in +++ configure.in -@@ -982,7 +982,6 @@ +@@ -997,7 +997,6 @@ dll/amp/Makefile dll/arcfour/Makefile dll/autocycle/Makefile ++++++ bitchx-configs.dif -> bitchx-configs.patch ++++++ --- bitchx/bitchx-configs.dif 2002-05-14 08:02:31.000000000 +0200 +++ bitchx/bitchx-configs.patch 2006-03-29 19:38:08.000000000 +0200 @@ -1,7 +1,6 @@ -diff -ur BitchX/include/color.h BitchX.mmj/include/color.h ---- BitchX/include/color.h Mon Mar 5 20:38:48 2001 -+++ BitchX.mmj/include/color.h Mon May 13 17:59:37 2002 -@@ -717,8 +717,8 @@ +--- BitchX/include/color.h ++++ BitchX/include/color.h +@@ -759,8 +759,8 @@ #define DEFAULT_FORMAT_NICK_MSG_FSET "$0 $1 $2-" @@ -12,10 +11,9 @@ #define DEFAULT_FORMAT_STATUS_FSET "%4%W$0-" #define DEFAULT_FORMAT_STATUS1_FSET "%4%W$0-" -diff -ur BitchX/include/config.h BitchX.mmj/include/config.h ---- BitchX/include/config.h Sun Mar 24 10:31:04 2002 -+++ BitchX.mmj/include/config.h Mon May 13 18:00:43 2002 -@@ -239,7 +239,7 @@ +--- BitchX/include/config.h ++++ BitchX/include/config.h +@@ -225,7 +225,7 @@ * in the client. defining this variable to 1 allows that happen. It also * adds a HEBREW_TOGGLE variable which can turn this feature on/off */ @@ -24,7 +22,7 @@ /* if you use cidentd the filename is called .authlie instead of .noident. * as well some modifications to the format of the file were made. So we -@@ -325,7 +325,7 @@ +@@ -311,7 +311,7 @@ * * Is here there any solution to use both fonts nethertheless ? */ @@ -33,7 +31,7 @@ /* * If you use LINUX and non ISO8859-1 fonts with custom screen mapping, -@@ -377,12 +377,12 @@ +@@ -363,12 +363,12 @@ #define DEFAULT_MSGLOG ON #define DEFAULT_AUTO_NSLOOKUP OFF #define DEFAULT_ALT_CHARSET ON @@ -49,7 +47,7 @@ #define DEFAULT_AUTO_UNMARK_AWAY OFF #define DEFAULT_AUTO_WHOWAS OFF #define DEFAULT_BANTIME 600 -@@ -393,7 +393,7 @@ +@@ -379,7 +379,7 @@ #define DEFAULT_BLINK_VIDEO ON #define DEFAULT_CHANNEL_NAME_WIDTH 10 #define DEFAULT_CLOCK ON @@ -58,7 +56,7 @@ #define DEFAULT_COMMAND_MODE OFF #define DEFAULT_COMMENT_HACK ON #define DEFAULT_DCC_BLOCK_SIZE 2048 -@@ -430,7 +430,7 @@ +@@ -416,7 +416,7 @@ #define DEFAULT_SEND_IGNORE_MSG OFF #define DEFAULT_SEND_OP_MSG ON #define DEFAULT_SHELL_LIMIT 0 @@ -67,7 +65,7 @@ #define DEFAULT_SHOW_CHANNEL_NAMES ON #define DEFAULT_SHOW_END_OF_MSGS OFF #define DEFAULT_SHOW_NUMERICS OFF -@@ -447,14 +447,14 @@ +@@ -433,14 +433,14 @@ #define DEFAULT_SEND_AWAY_MSG OFF #define DEFAULT_SEND_CTCP_MSG ON #define DEFAULT_SOCKS_PORT 1080 @@ -84,7 +82,7 @@ #define DEFAULT_DCC_AUTORENAME ON #define DEFAULT_DCC_AUTORESUME OFF #define DEFAULT_DCC_AUTORENAME_ON_NICKNAME OFF -@@ -494,10 +494,10 @@ +@@ -480,10 +480,10 @@ #define DEFAULT_AINV 0 #define DEFAULT_ANNOY_KICK OFF #define DEFAULT_AOP_VAR OFF @@ -98,7 +96,7 @@ #if defined(__EMXPM__) || defined(WIN32) #define DEFAULT_CODEPAGE 437 #endif -@@ -508,16 +508,16 @@ +@@ -494,16 +494,16 @@ #define DEFAULT_DEOP_ON_KICKFLOOD 3 #define DEFAULT_KICK_IF_BANNED OFF #define DEFAULT_HACKING 0 /* 0 1 2 */ @@ -118,7 +116,7 @@ #define DEFAULT_NICKFLOOD_TIME 30 #ifdef __EMXPM__ #define DEFAULT_NICKLIST 10 -@@ -589,7 +589,7 @@ +@@ -575,7 +575,7 @@ #endif /* _USE_LOCAL_CONFIG */ @@ -127,7 +125,7 @@ #define DEFAULT_PROTECT_CHANNELS "*" #define DEFAULT_SHITLIST_REASON "Surplus Lamerz must go!!!!" #define DEFAULT_BEEP_ON_MSG "MSGS" -@@ -602,7 +602,7 @@ +@@ -588,7 +588,7 @@ #define DEFAULT_SHELL "/bin/sh" #define DEFAULT_SHELL_FLAGS "-c" #define DEFAULT_USERINFO "" @@ -136,7 +134,7 @@ #define DEFAULT_XTERM_OPTIONS "-bg black -fg white" #define DEFAULT_DCC_DLDIR "~" -@@ -693,9 +693,7 @@ +@@ -679,9 +679,7 @@ #undef WANT_CHATNET /* define just for codelogic */ #endif ++++++ bitchx-gcc34.patch ++++++ --- BitchX/source/term.c +++ BitchX/source/term.c @@ -92,7 +92,7 @@ #endif extern char *getenv(); -extern char *tparm(); +extern char *tparm(const char *str, ...); /* * The old code assumed termcap. termcap is almost always present, but on ++++++ bitchx-mandir.patch ++++++ --- Makefile.in +++ Makefile.in @@ -297,7 +297,7 @@ cd $(top_srcdir)/doc; \ for i in BitchX.1; do \ if test -f $$i; then \ - $(INSTALL_DATA) $$i $(mandir)/man1; \ + $(INSTALL_DATA) $$i $(prefix)/share/man/man1; \ fi; \ done; \ fi; \ @@ -306,7 +306,7 @@ (xargs bzip2 -9f || xargs gzip -9f) || :) 2>/dev/null installdirs: - umask 022; $(top_srcdir)/mkinstalldirs $(bindir) $(IRCLIB) $(mandir)/man1 $(TRANSLATION_PATH) $(INSTALL_SCRIPT) $(HELPDIR) + umask 022; $(top_srcdir)/mkinstalldirs $(bindir) $(IRCLIB) $(prefix)/share/man/man1 $(TRANSLATION_PATH) $(INSTALL_SCRIPT) $(HELPDIR) local_installdirs: umask 022; $(top_srcdir)/mkinstalldirs $(local_dir)/bin $(DEFAULT_CTOOLZ_DIR) $(DEFAULT_CTOOLZ_DIR)/plugins $(DEFAULT_CTOOLZ_DIR)/logs ++++++ bitchx-non_static_decl.patch ++++++ --- source/ctcp.c +++ source/ctcp.c @@ -176,7 +176,7 @@ /* CDE do ops and unban logging */ -static char *ctcp_type[] = +char *ctcp_type[] = { "PRIVMSG", "NOTICE" --- source/timer.c +++ source/timer.c @@ -148,7 +148,7 @@ * This is put here on purpose -- we dont want any of the above functions * to have any knowledge of this struct. */ -static TimerList *PendingTimers; +TimerList *PendingTimers; static char *schedule_timer (TimerList *ntimer); static char *current_exec_timer = empty_string; ++++++ bitchx-not_in_display.patch ++++++ --- include/modval.h +++ include/modval.h @@ -169,7 +169,7 @@ #define MatchingBracket(x, y, z) ((char *) (global[MATCHINGBRACKET]((char *)x, ( char)y, (char)z))) #define parse_number(x) ((int) (global[PARSE_NUMBER]((char **)x))) #define splitw(x, y) ((int) (global[SPLITW]((char *)x, (char ***)y))) -#define unsplitw(x, y) ((char *) (global[UNSPLITW]((char ***)x, (char *)y))) +#define unsplitw(x, y) ((char *) (global[UNSPLITW]((char ***)x, (int)y))) #define check_val(x) ((int) (global[CHECK_VAL]((char *)x))) #define on_off(x) ((char *) (global[ON_OFF]((int)x))) #define strextend(x, y, n) ((char *) (global[STREXTEND]((char *)x, (char)y, (int)n))) @@ -279,7 +279,7 @@ #define output_line(x) ((int) (global[OUTPUT_LINE]((const unsigned char *)x))) #define output_with_count(x, y, z) ((int) (global[OUTPUT_WITH_COUNT]((const unsigned char *)x, (int)y, (int)z))) #define scroll_window(x) ((void) (global[SCROLL_WINDOW]((Window *)x))) -#define cursor_not_in_display(x) ((void) (global[CURSOR_IN_DISPLAY]((Screen *)x))) +#define cursor_not_in_display(x) ((void) (global[CURSOR_NOT_IN_DISPLAY]((Screen *)x))) #define cursor_in_display(x) ((void) (global[CURSOR_IN_DISPLAY]((Screen *)x))) #define is_cursor_in_display(x) ((int) (global[IS_CURSOR_IN_DISPLAY]((Screen *)x))) #define repaint_window(x, y, z) ((void) (global[REPAINT_WINDOW]((Window *)x, (int)y, (int)z))) ++++++ bitchx-overflow.patch ++++++ --- BitchX/source/server.c +++ BitchX/source/server.c @@ -151,7 +151,7 @@ if (x_debug & DEBUG_OUTBOUND) yell("Closing server %d because [%s]", cs_index, message ? message : empty_string); - snprintf(buffer, BIG_BUFFER_SIZE, "QUIT :%s\n", message); + snprintf(buffer, sizeof(buffer), "QUIT :%s\n", message); #ifdef HAVE_SSL if (get_server_ssl(cs_index)) SSL_write(server_list[cs_index].ssl_fd, buffer, strlen(buffer)); ++++++ bitchx-pointer_casting_64.patch ++++++ ++++ 763 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dragonegg
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package dragonegg checked in at Fri Mar 31 15:29:17 CEST 2006. -------- --- KDE/dragonegg/dragonegg.changes 2006-02-14 20:08:57.000000000 +0100 +++ dragonegg/dragonegg.changes 2006-03-29 17:25:08.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 16:03:36 CEST 2006 - dmueller(a)suse.de + +- ignore mtime changes (#155318) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dragonegg.spec ++++++ --- /var/tmp/diff_new_pack.5Br90x/_old 2006-03-31 15:29:14.000000000 +0200 +++ /var/tmp/diff_new_pack.5Br90x/_new 2006-03-31 15:29:14.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/GUI/KDE Summary: Mozilla Plug-In to Embed KDE KParts Version: 0.1 -Release: 6 +Release: 13 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 @@ -50,9 +50,11 @@ %files %defattr(-,root,root) -/usr/%_lib/browser-plugins/libdragonegg.so +%verify(not mtime) /usr/%_lib/browser-plugins/libdragonegg.so %changelog -n dragonegg +* Wed Mar 29 2006 - dmueller(a)suse.de +- ignore mtime changes (#155318) * Tue Feb 14 2006 - dmueller(a)suse.de - make the error label show properly if no kpdf is found - don't fall back to kghostview if kpdf is not loading (#116389) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0