March 2010 - openSUSE Commits - openSUSE Mailing Lists

commit MozillaFirefox for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '10

26 Mar '10

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at Fri Mar 26 02:09:48 CET 2010. -------- --- MozillaFirefox/MozillaFirefox.changes 2010-01-19 07:21:04.000000000 +0100 +++ MozillaFirefox/MozillaFirefox.changes 2010-03-23 21:07:50.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 18 06:43:33 CET 2010 - wr(a)rosenauer.org + +- security update to version 3.6.2 (bnc#586567) + * MFSA 2010-08/CVE-2010-1028 (bmo#552216) + WOFF heap corruption due to integer overflow + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- firefox-3.6.0-source.tar.bz2 l10n-3.6.0.tar.bz2 New: ---- firefox-3.6.2-source.tar.bz2 l10n-3.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.Du06Xa/_old 2010-03-26 02:08:41.000000000 +0100 +++ /var/tmp/diff_new_pack.Du06Xa/_new 2010-03-26 02:08:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 3.6.0) +# spec file for package MozillaFirefox (Version 3.6.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2010 Wolfgang Rosenauer @@ -22,7 +22,7 @@ Name: MozillaFirefox %define xulrunner mozilla-xulrunner192 BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip -BuildRequires: %{xulrunner}-devel = 1.9.2.0 +BuildRequires: %{xulrunner}-devel = 1.9.2.2 %if %suse_version > 1020 BuildRequires: fdupes %endif @@ -34,9 +34,9 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Provides: web_browser Provides: firefox -Version: 3.6.0 +Version: 3.6.2 Release: 1 -%define releasedate 2010011500 +%define releasedate 2010031700 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -370,6 +370,7 @@ %endif %{_bindir}/%{progname} %doc %{_mandir}/man1/%{progname}.1.gz + %if %localize %files translations-common -f %{_tmppath}/translations.common ++++++ firefox-3.6.0-source.tar.bz2 -> firefox-3.6.2-source.tar.bz2 ++++++ MozillaFirefox/firefox-3.6.0-source.tar.bz2 MozillaFirefox/firefox-3.6.2-source.tar.bz2 differ: char 11, line 1 ++++++ l10n-3.6.0.tar.bz2 -> l10n-3.6.2.tar.bz2 ++++++ MozillaFirefox/l10n-3.6.0.tar.bz2 MozillaFirefox/l10n-3.6.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-input for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '10

26 Mar '10

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Fri Mar 26 02:05:50 CET 2010. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-01-19 09:07:01.000000000 +0100 +++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-03-23 15:12:11.000000000 +0100 @@ -1,0 +2,45 @@ +Tue Mar 23 15:11:40 CET 2010 - ro(a)suse.de + +- 20-synaptics.conf: only run for /dev/input/event* + (largely speed up xserver start) + +------------------------------------------------------------------- +Fri Mar 19 16:10:07 CET 2010 - ro(a)suse.de + +- removed hal fdi files and added xorg-conf snippets for + input devices + - 00-evdev.conf: basic evdev catchall (from fedora) + - 10-quirks.conf: do not use accelerometer as mouse (from fedora) + - 11-mouse.conf: translated version of 11-mouse.fdi + - 20-synaptics.conf: translated version of 11-x11-synaptics.fdi + - 20-wacom.conf: version of wacom.fdi + +------------------------------------------------------------------- +Thu Mar 18 12:44:10 CET 2010 - ro(a)suse.de + +- change INPUT_ABI_VERSION to 9 + +------------------------------------------------------------------- +Mon Feb 8 17:34:30 UTC 2010 - mhopf(a)novell.com + +- synaptics-retry-serial-open.diff: + Increase number of reconnect tries after S3/S4. + Don't retry unless it had been successful at least once, though. + (bnc #573644,569340,573642) + +------------------------------------------------------------------- +Wed Feb 3 18:04:13 UTC 2010 - mhopf(a)novell.com + +- synaptics-retry-serial-open.diff completely reworked: + Reprobe /dev/input/event* devices always upon DeviceOn, + check for race with kernel reassigning devices. + (bnc #573644,569340,573642) + +------------------------------------------------------------------- +Mon Feb 1 18:49:30 UTC 2010 - mhopf(a)novell.com + +- synaptics-retry-serial-open.diff by Takashi: + Wait for synaptics device to settle upon DeviceOn + (bnc #573644,569340,573642) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 11-mouse.fdi 11-x11-synaptics.fdi New: ---- 00-evdev.conf 10-quirks.conf 11-mouse.conf 20-synaptics.conf 20-wacom.conf synaptics-retry-serial-open.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.T2FPTx/_old 2010-03-26 02:00:21.000000000 +0100 +++ /var/tmp/diff_new_pack.T2FPTx/_new 2010-03-26 02:00:21.000000000 +0100 @@ -24,14 +24,13 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 43 +Release: 44 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 -Requires: hal Requires: xkeyboard-config >= 1.5 Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/mouse_drv.so x11-input-synaptics x11-input-wacom x11-input-wacom-devel x11-input-wacom-tools -Requires: INPUT_ABI_VERSION = 7 +Requires: INPUT_ABI_VERSION = 9 Obsoletes: x11-input-synaptics x11-input-wacom x11-input-wacom-devel x11-input-wacom-tools Supplements: xorg-x11-server Summary: X.Org input drivers @@ -52,9 +51,12 @@ Source27: xf86-input-void-1.3.0.tar.bz2 Source29: xf86-input-synaptics-1.2.1.tar.bz2 Source30: xf86-input-evdev-2.3.2.tar.bz2 -Source31: 11-x11-synaptics.fdi -Source32: 11-mouse.fdi Source33: xf86-input-wacom-0.10.4.tar.bz2 +Source40: 00-evdev.conf +Source41: 10-quirks.conf +Source42: 11-mouse.conf +Source43: 20-synaptics.conf +Source44: 20-wacom.conf Patch2: xf86-input-jamstudio.diff Patch3: p_mouse_misc.diff Patch5: evdev-overflow.diff @@ -72,6 +74,7 @@ Patch40: xf86-input-hyperpen.diff Patch41: xf86-input-mutouch.diff Patch42: xf86-input-penmount.diff +Patch43: synaptics-retry-serial-open.diff %description This package contains X.Org input drivers. @@ -110,6 +113,7 @@ pushd xf86-input-synaptics-* %patch23 -p0 %patch24 -p0 +%patch43 -p1 popd pushd xf86-input-elographics-* %patch38 -p1 @@ -156,23 +160,18 @@ *) make -C $dir install DESTDIR=$RPM_BUILD_ROOT ;; esac done -mkdir -p $RPM_BUILD_ROOT/usr/share/hal/fdi/policy/10osvendor -mkdir -p $RPM_BUILD_ROOT/usr/share/hal/fdi/policy/20thirdparty -install -m 644 $RPM_SOURCE_DIR/11-x11-synaptics.fdi \ - $RPM_BUILD_ROOT/usr/share/hal/fdi/policy/10osvendor -install -m 644 $RPM_SOURCE_DIR/11-mouse.fdi \ - $RPM_BUILD_ROOT/usr/share/hal/fdi/policy/20thirdparty +rm -f $RPM_BUILD_ROOT/usr/share/hal/fdi/policy/20thirdparty/wacom.fdi +rm -f $RPM_BUILD_ROOT/usr/share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi +rm -f $RPM_BUILD_ROOT/usr/%{_lib}/hal/hal-probe-vmmouse +mkdir -p $RPM_BUILD_ROOT/etc/X11/xorg.conf.d +install -m 644 %{S:40} %{S:41} %{S:42} %{S:43} %{S:44} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d %clean rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) -%dir /usr/share/hal -%dir /usr/share/hal/fdi -%dir /usr/share/hal/fdi/policy -%dir /usr/share/hal/fdi/policy/10osvendor -%dir /usr/share/hal/fdi/policy/20thirdparty +%dir /etc/X11/xorg.conf.d /usr/include/xorg/evdev-properties.h /usr/include/xorg/joystick-properties.h /usr/include/xorg/synaptics-properties.h @@ -189,14 +188,9 @@ /usr/bin/syn* /usr/bin/xsetwacom %ifarch %ix86 x86_64 -%dir /usr/%{_lib}/hal /usr/bin/vmmouse_detect -/usr/%{_lib}/hal/hal-probe-vmmouse -/usr/share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi /usr/share/man/man1/vmmouse_detect.1.gz %endif -/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi -/usr/share/hal/fdi/policy/20thirdparty/11-mouse.fdi -/usr/share/hal/fdi/policy/20thirdparty/wacom.fdi +%config /etc/X11/xorg.conf.d/* %changelog ++++++ 00-evdev.conf ++++++ # Catchall classes for input devices # We don't simply match on any device since that also adds accelerometers # and other devices that we don't really want to use. The list below # matches everything but joysticks. Section "InputClass" Identifier "evdev pointer catchall" MatchIsPointer "on" MatchDevicePath "/dev/input/event*" Driver "evdev" EndSection Section "InputClass" Identifier "evdev keyboard catchall" MatchIsKeyboard "on" MatchDevicePath "/dev/input/event*" Driver "evdev" EndSection Section "InputClass" Identifier "evdev touchpad catchall" MatchIsTouchpad "on" MatchDevicePath "/dev/input/event*" Driver "evdev" EndSection Section "InputClass" Identifier "evdev tablet catchall" MatchIsTablet "on" MatchDevicePath "/dev/input/event*" Driver "evdev" EndSection Section "InputClass" Identifier "evdev touchscreen catchall" MatchIsTouchscreen "on" MatchDevicePath "/dev/input/event*" Driver "evdev" EndSection ++++++ 10-quirks.conf ++++++ # Collection of quirks and blacklist/whitelists for specific devices. # Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable # http://bugs.freedesktop.org/show_bug.cgi?id=22442 Section "InputClass" Identifier "ThinkPad HDAPS accelerometer blacklist" MatchProduct "ThinkPad HDAPS accelerometer data" Option "Ignore" "on" EndSection ++++++ 11-mouse.conf ++++++ Section "InputClass" # 046d:c50e # 046d:c501 Identifier "Logitech Trackball" MatchVendor "Logitech, Inc." MatchProduct "MX-1000 Cordless Mouse Receiver|Cordless Mouse Receiver" MatchIsPointer "on" Driver "evdev" Option "Buttons" "8" Option "EmulateWheel" "on" Option "EmulateWheelButton" "8" Option "YAxisMapping" "4 5" Option "XAxisMapping" "6 7" EndSection Section "InputClass" # 046d:c521 Identifier "Logitech Multibutton Mouse" MatchVendor "Logitech, Inc." MatchProduct "MX620 Laser Cordless Mouse" MatchIsPointer "on" Driver "evdev" Option "HWHEELRelativeAxisButtons" "7 6" EndSection Section "InputClass" # 045e:0095 Identifier "Microsoft IntelliMouse Explorer" MatchVendor "Microsoft Corp." MatchProduct "IntelliMouse Explorer 4.0 (IntelliPoint)" MatchIsPointer "on" Driver "evdev" Option "HWHEELRelativeAxisButtons" "7 6" EndSection Section "InputClass" # 0210:0003 Identifier "0210:0003" MatchVendor "0210" MatchProduct "0003" MatchIsPointer "on" Driver "evdev" Option "EmulateWheel" "on" Option "EmulateWheelButton" "2" EndSection Section "InputClass" # 0002:000a Identifier "0002:000a" MatchVendor "0002" MatchProduct "000a" MatchIsPointer "on" Driver "evdev" Option "EmulateWheel" "on" Option "EmulateWheelButton" "2" EndSection Section "InputClass" # 04b3:300f Identifier "IBM 300f" MatchVendor "IBM Corp." MatchProduct "300f" MatchIsPointer "on" Driver "evdev" Option "EmulateWheel" "on" Option "EmulateWheelButton" "2" EndSection Section "InputClass" # unknown Identifier "IBM TPPS/2 TrackPoint" MatchVendor "IBM Corp." MatchProduct "TPPS/2 IBM TrackPoint" MatchIsPointer "on" Driver "evdev" Option "EmulateWheel" "on" Option "EmulateWheelButton" "2" Option "YAxisMapping" "4 5" Option "Emulate3Buttons" "on" Option "EmulateWheelTimeout" "200" EndSection Section "InputClass" # 03f0:1126 Identifier "HP 1126" MatchVendor "Hewlett-Packard" MatchProduct "1126" MatchIsPointer "on" Driver "evdev" Option "MinX" "0" Option "MaxX" "3000" Option "MinY" "0" Option "MaxY" "3000" EndSection ++++++ 20-synaptics.conf ++++++ Section "InputClass" Identifier "SynapticsTouchPad" MatchIsTouchpad "on" MatchProduct "Synaptics TouchPad|AlpsPS/2 ALPS|appletouch|bcm5974|ETPS/2 Elantech Touchpad" MatchDevicePath "/dev/input/event*" Driver "synaptics" Option "LeftEdge" "120" Option "SHMConfig" "on" Option "HorizScrollDelta" "0" EndSection ++++++ 20-wacom.conf ++++++ Section "InputClass" Identifier "Wacom Tablet" MatchVendor "Wacom|WALTOP|WACOM" Driver "wacom" EndSection Section "InputClass" Identifier "Wacom Tablet 2" MatchProduct "WACf|FUJ02e5|FUJ02e7" Driver "wacom" Option "ForceDevice" "ISDV4" EndSection Section "InputClass" # N-Trig Duosense Electromagnetic Digitizer Identifier "N-Trig Tablet" MatchProduct "HID 1b96:0001" Driver "wacom" EndSection ++++++ synaptics-retry-serial-open.diff ++++++ Fixes bnc 573644,569340,573642 - Synaptics driver does not survive S3/S4 Index: xf86-input-synaptics-1.2.1/src/synaptics.c =================================================================== --- xf86-input-synaptics-1.2.1.orig/src/synaptics.c +++ xf86-input-synaptics-1.2.1/src/synaptics.c @@ -198,7 +198,8 @@ SetDeviceAndProtocol(LocalDevicePtr loca } if (device && strstr(device, "/dev/input/event")) { #ifdef BUILD_EVENTCOMM - proto = SYN_PROTO_EVENT; + if (event_proto_operations.AutoDevProbe(local)) + proto = SYN_PROTO_EVENT; #endif } else { str_par = xf86FindOptionValue(local->options, "Protocol"); @@ -746,15 +747,22 @@ DeviceControl(DeviceIntPtr dev, int mode } static Bool -DeviceOn(DeviceIntPtr dev) +_DeviceOn(LocalDevicePtr local) { - LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; SynapticsPrivate *priv = (SynapticsPrivate *) (local->private); + static int tries = 1; + int n; DBG(3, ErrorF("Synaptics DeviceOn called\n")); - SetDeviceAndProtocol(local); - local->fd = xf86OpenSerial(local->options); + for (n = tries-1; n >= 0; n--) { + SetDeviceAndProtocol(local); + local->fd = xf86OpenSerial(local->options); + if (local->fd != -1) + break; + if (n) + xf86Msg(X_WARNING, "%s: cannot open input device - retrying %d more times\n", local->name, n); + } if (local->fd == -1) { xf86Msg(X_WARNING, "%s: cannot open input device\n", local->name); return !Success; @@ -782,16 +790,30 @@ DeviceOn(DeviceIntPtr dev) return !Success; } + /* This has succeeded once, so chances are the hardware *really* is present + * - this is not a hotplug device after all. + * Without trying really hard on some machines with some kernels the device + * won't be found after S3/S4 again. */ + tries = 5; + xf86AddEnabledDevice(local); - dev->public.on = TRUE; return Success; } static Bool -DeviceOff(DeviceIntPtr dev) +DeviceOn(DeviceIntPtr dev) +{ + Bool ret = _DeviceOn((LocalDevicePtr)dev->public.devicePrivate); + + if (ret) + dev->public.on = TRUE; + return ret; +} + +static Bool +_DeviceOff(LocalDevicePtr local) { - LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; SynapticsPrivate *priv = (SynapticsPrivate *) (local->private); DBG(3, ErrorF("Synaptics DeviceOff called\n")); @@ -807,6 +829,13 @@ DeviceOff(DeviceIntPtr dev) } xf86CloseSerial(local->fd); } + return Success; +} + +static Bool +DeviceOff(DeviceIntPtr dev) +{ + _DeviceOff((LocalDevicePtr)dev->public.devicePrivate); dev->public.on = FALSE; return Success; } @@ -1143,14 +1172,27 @@ ReadInput(LocalDevicePtr local) struct SynapticsHwState hw; int delay = 0; Bool newDelay = FALSE; + int processed = 0; while (SynapticsGetHwState(local, priv, &hw)) { + processed++; hw.millis = GetTimeInMillis(); priv->hwState = hw; delay = HandleState(local, &hw); newDelay = TRUE; } + if (!processed) { + /* strange callback, check the device and reconnect if needed */ + if (1 /*dev && access(dev, 0)*/) { + xf86Msg(X_WARNING, "%s: reconnecting device...\n", local->name); + _DeviceOff(local); + usleep(100*1000); + _DeviceOn(local); + xf86Msg(X_WARNING, "%s: reconnection done\n", local->name); + } + } + if (newDelay) priv->timer = TimerSet(priv->timer, 0, delay, timerFunc, local); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nfsidmap for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '10

26 Mar '10

Hello community, here is the log from the commit of package nfsidmap for openSUSE:Factory checked in at Fri Mar 26 02:00:07 CET 2010. -------- --- nfsidmap/nfsidmap.changes 2010-03-19 09:04:39.000000000 +0100 +++ nfsidmap/nfsidmap.changes 2010-03-24 14:55:25.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 24 14:41:14 CET 2010 - meissner(a)suse.de + +- also remove .la files from the libnfsidmap subdir +- fixed missing ctype.h header include + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfsidmap.spec ++++++ --- /var/tmp/diff_new_pack.yuqfrz/_old 2010-03-26 01:59:35.000000000 +0100 +++ /var/tmp/diff_new_pack.yuqfrz/_new 2010-03-26 01:59:35.000000000 +0100 @@ -22,7 +22,7 @@ Url: http://nfs.sourceforge.net Summary: NFSv4 ID Mapping Library Version: 0.23 -Release: 1 +Release: 2 Group: Productivity/Networking/NFS License: BSD3c BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -76,6 +76,7 @@ %install make DESTDIR=$RPM_BUILD_ROOT install %{__rm} -f %{buildroot}%{_libdir}/*.la +%{__rm} -f %{buildroot}%{_libdir}/libnfsidmap/*.la %clean rm -rf $RPM_BUILD_ROOT ++++++ fix-prototype.patch ++++++ --- /var/tmp/diff_new_pack.yuqfrz/_old 2010-03-26 01:59:35.000000000 +0100 +++ /var/tmp/diff_new_pack.yuqfrz/_new 2010-03-26 01:59:35.000000000 +0100 @@ -29,3 +29,13 @@ #include "nfsidmap.h" #include "nfsidmap_internal.h" #include "cfg.h" +--- libnfsidmap.c ++++ libnfsidmap.c +@@ -49,6 +49,7 @@ + #include <syslog.h> + #include <stdarg.h> + #include <dlfcn.h> ++#include <ctype.h> + #include "nfsidmap.h" + #include "nfsidmap_internal.h" + #include "cfg.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '10

26 Mar '10

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at Fri Mar 26 01:59:23 CET 2010. -------- --- yast2-network/yast2-network.changes 2010-03-17 09:13:26.000000000 +0100 +++ yast2-network/yast2-network.changes 2010-03-24 15:12:59.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Mar 24 15:10:33 CET 2010 - mzugec(a)suse.cz + +- store hostname from installation proposal dialog (bnc#588938) +- 2.19.18 + +------------------------------------------------------------------- +Tue Mar 23 10:44:20 CET 2010 - mzugec(a)suse.cz + +- fixed description for IP/netmask (bnc#588590) +- 2.19.17 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-network-2.19.16.tar.bz2 New: ---- yast2-network-2.19.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.rGlV2e/_old 2010-03-26 01:54:48.000000000 +0100 +++ /var/tmp/diff_new_pack.rGlV2e/_new 2010-03-26 01:54:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.19.16) +# spec file for package yast2-network (Version 2.19.18) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-network -Version: 2.19.16 +Version: 2.19.18 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.16.tar.bz2 +Source0: yast2-network-2.19.18.tar.bz2 Prefix: /usr @@ -73,7 +73,7 @@ This package contains autogenerated documentation for yast2-network %prep -%setup -n yast2-network-2.19.16 +%setup -n yast2-network-2.19.18 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-network-2.19.16.tar.bz2 -> yast2-network-2.19.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.19.16/VERSION new/yast2-network-2.19.18/VERSION --- old/yast2-network-2.19.16/VERSION 2010-03-17 09:11:52.000000000 +0100 +++ new/yast2-network-2.19.18/VERSION 2010-03-24 15:10:11.000000000 +0100 @@ -1 +1 @@ -2.19.16 +2.19.18 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.19.16/src/modules/DNS.ycp new/yast2-network-2.19.18/src/modules/DNS.ycp --- old/yast2-network-2.19.16/src/modules/DNS.ycp 2010-02-08 16:19:14.000000000 +0100 +++ new/yast2-network-2.19.18/src/modules/DNS.ycp 2010-03-24 15:11:58.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Hostname and DNS data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: DNS.ycp 60556 2010-01-27 14:21:30Z kmachalkova $ + * $Id: DNS.ycp 61468 2010-03-24 14:11:57Z mzugec $ * * Manages resolv.conf and (fully qualified) hostname, also * respecting DHCP. @@ -127,6 +127,12 @@ fqhostname = ""; } + // We have non-empty hostname by now => we must set DNS modified flag + // in order to get the setting actually written (bnc#588938) + if (size(fqhostname) > 0) + DNS::modified = true; + + // /etc/HOSTNAME // the usual location if (fqhostname == "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.19.16/src/modules/LanItems.ycp new/yast2-network-2.19.18/src/modules/LanItems.ycp --- old/yast2-network-2.19.16/src/modules/LanItems.ycp 2010-03-17 09:11:46.000000000 +0100 +++ new/yast2-network-2.19.18/src/modules/LanItems.ycp 2010-03-23 10:42:06.000000000 +0100 @@ -510,12 +510,14 @@ if (ip != "NONE") { string prefixlen = NetworkInterfaces::Current["PREFIXLEN"]:""; - string descr = sformat("%1 %2", _("IP address assigned using"), ip); - if (!issubstring(ip, "DHCP")) descr=(size(prefixlen)>0) ? + if (size(ip)>0){ + string descr = sformat("%1 %2", _("IP address assigned using"), ip); + if (!issubstring(ip, "DHCP")) descr=(size(prefixlen)>0) ? sformat(_("IP address: %1/%2"), ip, prefixlen) : sformat(_("IP address: %1, subnet mask %2") , ip, NetworkInterfaces::Current["NETMASK"]:""); - bullets = bullets + [ descr ]; + bullets = bullets + [ descr ]; + } } // build aliases overview if (size(NetworkInterfaces::Current["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-xulrunner192 for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '10

26 Mar '10

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:Factory checked in at Fri Mar 26 01:53:24 CET 2010. -------- --- mozilla-xulrunner192/mozilla-xulrunner192.changes 2010-01-19 07:06:25.000000000 +0100 +++ mozilla-xulrunner192/mozilla-xulrunner192.changes 2010-03-25 20:11:09.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Mar 25 20:04:41 CET 2010 - wr(a)rosenauer.org + +- security update to 1.9.2.2 (bnc#586567) + * requires NSS 3.12.6 + * MFSA 2010-08/CVE-2010-1028 (bmo#552216) + WOFF heap corruption due to integer overflow +- general.useragent.locale in profile overrides + intl.locale.matchOS (bmo#542999) +- split mozilla-js192 package which contains libmozjs only + to allow its installation w/o all GUI dependencies + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-1.9.2.0.tar.bz2 mozilla-milestone.patch xulrunner-source-1.9.2.0.tar.bz2 New: ---- l10n-1.9.2.2.tar.bz2 mozilla-ua-locale-pref.patch xulrunner-source-1.9.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.TzCWx7/_old 2010-03-26 01:36:30.000000000 +0100 +++ /var/tmp/diff_new_pack.TzCWx7/_new 2010-03-26 01:36:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mozilla-xulrunner192 (Version 1.9.2.0) +# spec file for package mozilla-xulrunner192 (Version 1.9.2.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2010 Wolfgang Rosenauer @@ -39,12 +39,12 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.2.0 +Version: 1.9.2.2 Release: 1 -%define releasedate 2010011500 -%define version_internal 1.9.2.0 +%define releasedate 2010031700 +%define version_internal 1.9.2.2 %define apiversion 1.9.2 -%define uaweight 192000 +%define uaweight 192020 Summary: Mozilla Runtime Environment 1.9.2 Url: http://www.mozilla.org Group: Productivity/Other @@ -83,8 +83,9 @@ Patch13: toolkit-ui-lockdown.patch # --- Patch14: mozilla-breakpad-update.patch -Patch15: mozilla-milestone.patch +Patch15: mozilla-ua-locale-pref.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: mozilla-js192 Requires(post): update-alternatives coreutils Requires(preun): update-alternatives coreutils ### build configuration ### @@ -114,7 +115,7 @@ Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) %endif %if %has_system_nss -BuildRequires: mozilla-nss-devel >= 3.12.3 +BuildRequires: mozilla-nss-devel >= 3.12.6 Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) %endif Recommends: %{name}-gnome @@ -125,6 +126,18 @@ Thunderbird. +%package -n mozilla-js192 +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +Summary: Mozilla JS 1.8 engine +Group: Productivity/Other + +%description -n mozilla-js192 +JavaScript is the Netscape-developed object scripting language used in millions +of web pages and server applications worldwide. Netscape's JavaScript is a +superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language, +with only mild differences from the published standard. + + %package devel License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: XULRunner/Gecko SDK 1.9.2 @@ -219,6 +232,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +# bmo#542999 %patch15 -p1 %build @@ -256,6 +270,7 @@ mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZ_MILESTONE_RELEASE=1 mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj . \$topsrcdir/xulrunner/config/mozconfig ac_add_options --prefix=%{_prefix} ac_add_options --libdir=%{_libdir} @@ -319,6 +334,7 @@ make -f client.mk build %install +cd ../obj %makeinstall STRIP=/bin/true # remove some executable permissions find $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal} \ @@ -334,6 +350,17 @@ $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/ ln -sf ../../../xulrunner-%{version_internal}/libxul.so \ $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/ +# include basic buildenv for xulapps to use +mkdir -p $RPM_BUILD_ROOT%{_datadir}/xulrunner-%{version_internal} +pushd .. +# this list has been compiled by trial and error for prism +tar --exclude=*.cpp --exclude=*.mm \ + -cvjf $RPM_BUILD_ROOT%{_datadir}/xulrunner-%{version_internal}/mozilla-src.tar.bz2 \ + mozilla/configure.in mozilla/Makefile.in mozilla/client.py mozilla/allmakefiles.sh \ + mozilla/config mozilla/client.mk mozilla/aclocal.m4 mozilla/build mozilla/js/src/* \ + mozilla/testing mozilla/toolkit/mozapps/installer mozilla/probes mozilla/memory \ + mozilla/toolkit/xre mozilla/nsprpub/config mozilla/tools mozilla/xpcom/build +popd # XPI example #cp -rL dist/xpi-stage/simple $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version_internal}/ # preferences @@ -353,7 +380,7 @@ # install additional locales %if %localize rm -f %{_tmppath}/translations.* -for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do +for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do case $locale in ja-JP-mac|en-US) ;; @@ -400,10 +427,13 @@ %endif # create breakpad debugsymbols %if %crashreporter -make buildsymbols -if [ -e dist/*.crashreporter-symbols.zip ]; then +SYMBOLS_NAME="xulrunner-%{version}-%{release}.%{_arch}-%{suse_version}-symbols" +make buildsymbols \ + SYMBOL_INDEX_NAME="$SYMBOLS_NAME.txt" \ + SYMBOL_ARCHIVE_BASENAME="$SYMBOLS_NAME" +if [ -e dist/*symbols.zip ]; then mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/ - cp dist/*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/ + cp dist/*symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/ fi %endif @@ -477,6 +507,7 @@ %{_libdir}/xulrunner-%{version_internal}/plugins/ %{_libdir}/xulrunner-%{version_internal}/res/ %{_libdir}/xulrunner-%{version_internal}/*.so +%exclude %{_libdir}/xulrunner-%{version_internal}/libmozjs.so %{_libdir}/xulrunner-%{version_internal}/.autoreg %{_libdir}/xulrunner-%{version_internal}/add-plugins.sh %{_libdir}/xulrunner-%{version_internal}/dependentlibs.list @@ -507,6 +538,12 @@ %ghost %{_libdir}/xulrunner-%{ga_version} %endif +%files -n mozilla-js192 +%defattr(-,root,root) +%dir %{_libdir}/xulrunner-%{version_internal}/ +%{_libdir}/xulrunner-%{apiversion} +%{_libdir}/xulrunner-%{version_internal}/libmozjs.so + %files devel %defattr(-,root,root) %{_libdir}/xulrunner-%{version_internal}/xpcshell @@ -517,6 +554,7 @@ # FIXME symlink dynamic libs below sdk/lib %attr(644,root,root) %{_libdir}/pkgconfig/* %{_includedir}/xulrunner-%{version_internal}/ +%{_datadir}/xulrunner-%{version_internal}/ %files gnome %defattr(-,root,root) @@ -525,6 +563,7 @@ %ghost %{_libdir}/xulrunner-%{version_internal}/.autoreg %{_libdir}/xulrunner-%{version_internal}/components/libmozgnome.so %{_libdir}/xulrunner-%{version_internal}/components/libnkgnomevfs.so + %if %localize %files translations-common -f %{_tmppath}/translations.common @@ -537,6 +576,7 @@ %dir %{_libdir}/xulrunner-%{version_internal}/ %dir %{_libdir}/xulrunner-%{version_internal}/chrome/ %endif + %if %crashreporter %files buildsymbols ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.TzCWx7/_old 2010-03-26 01:36:30.000000000 +0100 +++ /var/tmp/diff_new_pack.TzCWx7/_new 2010-03-26 01:36:30.000000000 +0100 @@ -2,6 +2,9 @@ +/usr/lib(64)?/xulrunner-.* +/etc/gre.d/.* recommends "mozilla-xulrunner192-gnome-<targettype>" + requires "mozilla-js192-<targettype>" + +mozilla-js192 mozilla-xulrunner192-translations-common +/usr/lib(64)?/xulrunner-.* ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.TzCWx7/_old 2010-03-26 01:36:30.000000000 +0100 +++ /var/tmp/diff_new_pack.TzCWx7/_new 2010-03-26 01:36:30.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6rc2_RELEASE" -VERSION="1.9.2.0" +RELEASE_TAG="FIREFOX_3_6_2_RELEASE" +VERSION="1.9.2.2" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ l10n-1.9.2.0.tar.bz2 -> l10n-1.9.2.2.tar.bz2 ++++++ mozilla-xulrunner192/l10n-1.9.2.0.tar.bz2 mozilla-xulrunner192/l10n-1.9.2.2.tar.bz2 differ: char 11, line 1 ++++++ mozilla-gconf-backend.patch ++++++ --- /var/tmp/diff_new_pack.TzCWx7/_old 2010-03-26 01:36:31.000000000 +0100 +++ /var/tmp/diff_new_pack.TzCWx7/_new 2010-03-26 01:36:31.000000000 +0100 @@ -3466,9 +3466,9 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -229,16 +229,20 @@ endif - ifdef NS_OSSO - EXTRA_DSO_LDOPTS += $(LIBOSSO_LIBS) +@@ -225,16 +225,20 @@ endif + ifdef MOZ_ENABLE_LIBCONIC + EXTRA_DSO_LDOPTS += $(LIBCONIC_LIBS) endif ifdef MOZ_ENABLE_DBUS @@ -3490,7 +3490,7 @@ diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk --- a/toolkit/toolkit-tiers.mk +++ b/toolkit/toolkit-tiers.mk -@@ -253,16 +253,23 @@ endif +@@ -254,16 +254,23 @@ endif ifdef MOZ_ENABLE_LIBXUL tier_toolkit_dirs += xpcom/stub endif ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.TzCWx7/_old 2010-03-26 01:36:31.000000000 +0100 +++ /var/tmp/diff_new_pack.TzCWx7/_new 2010-03-26 01:36:31.000000000 +0100 @@ -40,7 +40,7 @@ #define SELECTED_SKIN_PREF "general.skins.selectedSkin" static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID); -@@ -1607,16 +1608,17 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1608,16 +1609,17 @@ nsChromeRegistry::ProcessManifestBuffer( NS_NAMED_LITERAL_STRING(kPlatform, "platform"); NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); @@ -58,7 +58,7 @@ rv = io->GetProtocolHandler("resource", getter_AddRefs(ph)); NS_ENSURE_SUCCESS(rv, rv); -@@ -1650,35 +1652,39 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1651,35 +1653,39 @@ nsChromeRegistry::ProcessManifestBuffer( if (NS_SUCCEEDED(rv)) { CopyUTF8toUTF16(s, osTarget); ToLowerCase(osTarget); @@ -98,7 +98,7 @@ // outer loop tokenizes by newline while (nsnull != (token = nsCRT::strtok(newline, kNewlines, &newline))) { -@@ -1712,41 +1718,43 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1713,41 +1719,43 @@ nsChromeRegistry::ProcessManifestBuffer( PRBool platform = PR_FALSE; PRBool xpcNativeWrappers = PR_TRUE; @@ -143,7 +143,7 @@ if (NS_FAILED(rv)) continue; -@@ -1797,38 +1805,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1798,38 +1806,40 @@ nsChromeRegistry::ProcessManifestBuffer( } EnsureLowerCase(package); @@ -185,7 +185,7 @@ if (NS_FAILED(rv)) continue; -@@ -1859,38 +1869,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1860,38 +1870,40 @@ nsChromeRegistry::ProcessManifestBuffer( } EnsureLowerCase(package); @@ -227,7 +227,7 @@ if (NS_FAILED(rv)) continue; -@@ -1923,38 +1935,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1924,38 +1936,40 @@ nsChromeRegistry::ProcessManifestBuffer( "Warning: malformed chrome overlay instruction."); continue; } @@ -269,7 +269,7 @@ rv |= io->NewURI(nsDependentCString(overlay), nsnull, nsnull, getter_AddRefs(overlayuri)); if (NS_FAILED(rv)) { -@@ -1979,38 +1993,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1980,38 +1994,40 @@ nsChromeRegistry::ProcessManifestBuffer( "Warning: malformed chrome style instruction."); continue; } @@ -311,7 +311,7 @@ rv |= io->NewURI(nsDependentCString(overlay), nsnull, nsnull, getter_AddRefs(overlayuri)); if (NS_FAILED(rv)) -@@ -2039,38 +2055,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -2040,38 +2056,40 @@ nsChromeRegistry::ProcessManifestBuffer( "Warning: malformed chrome override instruction."); continue; } @@ -353,7 +353,7 @@ rv |= io->NewURI(nsDependentCString(resolved), nsnull, manifestURI, getter_AddRefs(resolveduri)); if (NS_FAILED(rv)) -@@ -2101,38 +2119,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -2102,38 +2120,40 @@ nsChromeRegistry::ProcessManifestBuffer( } EnsureLowerCase(package); @@ -2593,7 +2593,7 @@ content \ docshell \ dom \ -@@ -131,17 +133,17 @@ CMMSRCS = nsNativeAppSupportCocoa.mm +@@ -132,17 +134,17 @@ CMMSRCS = nsNativeAppSupportCocoa.mm else ifeq ($(MOZ_WIDGET_TOOLKIT),os2) CPPSRCS += nsNativeAppSupportOS2.cpp @@ -3404,7 +3404,7 @@ --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp @@ -40,27 +40,30 @@ - #ifdef MOZ_PLATFORM_HILDON + #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS) #include <glib.h> #include <hildon-uri.h> #include <hildon-mime.h> @@ -3428,7 +3428,7 @@ { - nsresult rv = nsGNOMERegistry::LoadURL(aURI); + nsresult rv = nsCommonRegistry::LoadURL(aURI); - #ifdef MOZ_PLATFORM_HILDON + #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS) if (NS_FAILED(rv)){ HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull); if (action) { @@ -3545,7 +3545,7 @@ // Check the GConf registry for a protocol handler - *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme); + *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme); - #ifdef MOZ_PLATFORM_HILDON + #ifdef MOZ_PLATFORM_MAEMO *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme); #endif #endif @@ -3651,7 +3651,7 @@ #include "nsAccessibilityHelper.h" +#include "nsKDEUtils.h" - #ifdef MOZ_PLATFORM_HILDON + #ifdef MOZ_PLATFORM_MAEMO #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h> #endif @@ -3969,9 +3969,9 @@ LOCAL_INCLUDES = -I.. +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre - ifdef MOZ_PLATFORM_HILDON - CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(LIBHILDONMIME_CFLAGS) - CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(LIBHILDONMIME_CFLAGS) + ifeq ($(MOZ_PLATFORM_MAEMO), 5) + CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS) + CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS) endif diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp @@ -3989,7 +3989,7 @@ +#include "nsKDEUtils.h" #endif - #ifdef MOZ_PLATFORM_HILDON + #if (MOZ_PLATFORM_MAEMO == 5) #include <glib.h> #include <hildon-uri.h> #include <hildon-mime.h> ++++++ mozilla-libproxy.patch ++++++ --- /var/tmp/diff_new_pack.TzCWx7/_old 2010-03-26 01:36:31.000000000 +0100 +++ /var/tmp/diff_new_pack.TzCWx7/_new 2010-03-26 01:36:31.000000000 +0100 @@ -30,30 +30,22 @@ diff --git a/config/system-headers b/config/system-headers --- a/config/system-headers +++ b/config/system-headers -@@ -1007,15 +1007,19 @@ libsn/sn-monitor.h - libsn/sn-util.h - #endif - #if MOZ_NATIVE_HUNSPELL==1 - hunspell.hxx - #endif +@@ -1012,8 +1012,11 @@ hunspell.hxx #if MOZ_NATIVE_BZ2==1 bzlib.h #endif -+#ifdef MOZ_ENABLE_LIBPROXY -+proxy.h -+#endif -+ - #ifdef MOZ_PLATFORM_HILDON + #if MOZ_PLATFORM_MAEMO==5 hildon-uri.h hildon-mime.h - #endif - #ifdef NS_OSSO libosso.h #endif ++#ifdef MOZ_ENABLE_LIBPROXY ++proxy.h ++#endif diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -5280,16 +5280,39 @@ then +@@ -5289,16 +5289,39 @@ then AC_DEFINE(MOZ_ENABLE_DBUS) fi fi @@ -96,7 +88,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -247,16 +247,20 @@ endif +@@ -243,16 +243,20 @@ endif ifdef MOZ_TREE_FREETYPE EXTRA_DSO_LDOPTS += $(FT2_LIBS) endif ++++++ mozilla-ua-locale-pref.patch ++++++ diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp --- a/chrome/src/nsChromeRegistry.cpp +++ b/chrome/src/nsChromeRegistry.cpp @@ -1267,20 +1267,21 @@ nsChromeRegistry::WrappersEnabled(nsIURI return PL_DHASH_ENTRY_IS_LIVE(entry) && entry->flags & PackageEntry::XPCNATIVEWRAPPERS; } nsresult nsChromeRegistry::SelectLocaleFromPref(nsIPrefBranch* prefs) { nsresult rv; - PRBool matchOSLocale = PR_FALSE; + PRBool matchOSLocale = PR_FALSE, userLocaleOverride = PR_FALSE; + prefs->PrefHasUserValue(SELECTED_LOCALE_PREF, &userLocaleOverride); rv = prefs->GetBoolPref(MATCH_OS_LOCALE_PREF, &matchOSLocale); - if (NS_SUCCEEDED(rv) && matchOSLocale) { + if (NS_SUCCEEDED(rv) && matchOSLocale && !userLocaleOverride) { // compute lang and region code only when needed! nsCAutoString uiLocale; rv = getUILangCountry(uiLocale); if (NS_SUCCEEDED(rv)) mSelectedLocale = uiLocale; } else { nsXPIDLCString provider; diff --git a/chrome/test/unit/data/test_bug519468.manifest b/chrome/test/unit/data/test_bug519468.manifest deleted file mode 100644 --- a/chrome/test/unit/data/test_bug519468.manifest +++ /dev/null @@ -1,2 +0,0 @@ -locale testmatchos en-US jar:en-US.jar!/locale/en-US/global/ -locale testmatchos fr-FR jar:en-US.jar!/locale/en-US/global/ diff --git a/chrome/test/unit/test_bug519468.js b/chrome/test/unit/test_bug519468.js --- a/chrome/test/unit/test_bug519468.js +++ b/chrome/test/unit/test_bug519468.js @@ -31,50 +31,90 @@ * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ +function write_locale(stream, locale, package) { + var s = "locale " + package + " " + locale + " jar:" + locale + ".jar!"; + s += "/locale/" + locale + "/" + package +"/\n"; + stream.write(s, s.length); +} + +var localeService = Cc["@mozilla.org/intl/nslocaleservice;1"] + .getService(Ci.nsILocaleService); + +var systemLocale = localeService.getLocaleComponentForUserAgent(); + +var locales; + +if (systemLocale == "en-US") + locales = [ "en-US", "fr-FR", "de-DE" ]; +else if (systemLocale == "fr-FR") + locales = [ "en-US", systemLocale, "de-DE" ]; +else + locales = [ "en-US", systemLocale, "fr-FR" ]; + +var workingDir = Cc["@mozilla.org/file/directory_service;1"]. + getService(Ci.nsIProperties).get("TmpD", Ci.nsIFile); +var manifest = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile); +manifest.initWithFile(workingDir); +manifest.append("test_bug519468.manifest"); +manifest.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0600); +var stream = Cc["@mozilla.org/network/file-output-stream;1"]. + createInstance(Ci.nsIFileOutputStream); +stream.init(manifest, 0x04 | 0x08 | 0x20, 0600, 0); // write, create, truncate +locales.slice(0,2).forEach(function(l) write_locale(stream, l, "testmatchos")); +write_locale(stream, locales[2], "testnomatchos"); +stream.close(); + var MANIFESTS = [ - do_get_file("data/test_bug519468.manifest") + manifest ]; registerManifests(MANIFESTS); var chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"] .getService(Ci.nsIXULChromeRegistry) .QueryInterface(Ci.nsIToolkitChromeRegistry); -var localeService = Cc["@mozilla.org/intl/nslocaleservice;1"] - .getService(Ci.nsILocaleService); - var prefService = Cc["@mozilla.org/preferences-service;1"] .getService(Ci.nsIPrefService) .QueryInterface(Ci.nsIPrefBranch); function test_locale(aTest) { prefService.setBoolPref("intl.locale.matchOS", aTest.matchOS); - prefService.setCharPref("general.useragent.locale", aTest.selected || "en-US"); + if (aTest.selected) + prefService.setCharPref("general.useragent.locale", aTest.selected); + else + try { + prefService.clearUserPref("general.useragent.locale"); + } catch(e) {} - var selectedLocale = chromeReg.getSelectedLocale("testmatchos"); + var selectedLocale = chromeReg.getSelectedLocale(aTest.package); do_check_eq(selectedLocale, aTest.locale); } function run_test() { - var systemLocale = localeService.getLocaleComponentForUserAgent(); - var tests = [ - {matchOS: false, selected: null, locale: "en-US"}, {matchOS: true, selected: null, locale: systemLocale}, - {matchOS: true, selected: "fr-FR", locale: systemLocale}, - {matchOS: false, selected: "fr-FR", locale: "fr-FR"}, - {matchOS: true, selected: null, locale: systemLocale} + {matchOS: true, selected: locales[0], locale: locales[0]}, + {matchOS: true, selected: locales[1], locale: locales[1]}, + {matchOS: true, selected: locales[2], locale: locales[0]}, + {matchOS: true, selected: null, locale: locales[2], package: "testnomatchos"}, + {matchOS: false, selected: null, locale: locales[0]}, + {matchOS: false, selected: locales[0], locale: locales[0]}, + {matchOS: false, selected: locales[1], locale: locales[1]}, + {matchOS: false, selected: locales[2], locale: locales[0]}, ]; for (var i = 0; i < tests.length; ++ i) { var test = tests[i]; + if (!test.package) + test.package = "testmatchos"; test_locale(test); } + manifest.remove(false); } ++++++ xulrunner-source-1.9.2.0.tar.bz2 -> xulrunner-source-1.9.2.2.tar.bz2 ++++++ mozilla-xulrunner192/xulrunner-source-1.9.2.0.tar.bz2 mozilla-xulrunner192/xulrunner-source-1.9.2.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mdadm for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '10

26 Mar '10

Hello community, here is the log from the commit of package mdadm for openSUSE:Factory checked in at Fri Mar 26 01:36:13 CET 2010. -------- --- mdadm/mdadm.changes 2010-01-15 17:41:56.000000000 +0100 +++ mdadm/mdadm.changes 2010-03-24 17:41:52.000000000 +0100 @@ -1,0 +2,34 @@ +Wed Mar 24 17:37:27 CET 2010 - mmarek(a)suse.cz + +- 64-md-raid.rules: Use absolute path to grep, otherwise udev will + only search in /lib/udev (bnc#590832). + +------------------------------------------------------------------- +Tue Mar 23 14:49:38 CET 2010 - mmarek(a)suse.cz + +- mkinitrd-*.sh: Assemble md arrays even if the root= or resume= + option doesn't directly refer to md (bnc#589676, bnc#586837, + bnc#583424). + +------------------------------------------------------------------- +Thu Mar 11 10:18:18 CET 2010 - mmarek(a)suse.cz + +- 64-md-raid.rules: Use blkid instead of vol_id. + +------------------------------------------------------------------- +Thu Mar 11 09:58:21 CET 2010 - mmarek(a)suse.cz + +- 64-md-raid.rules: Allow --incremental assembly if "AUTO -all" is + given in mdadm.conf (fate#307478). + +------------------------------------------------------------------- +Tue Mar 9 16:15:41 CET 2010 - mmarek(a)suse.cz + +- Install udev rules in /lib/udev/rules.d (fate#307478). + +------------------------------------------------------------------- +Mon Feb 22 15:14:03 CET 2010 - mmarek(a)suse.cz + +- mkinitrd-setup.sh: call mdadm --scan only if necessary + (bnc#581769). + calling whatdependson for head-i586 New: ---- 64-md-raid.rules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdadm.spec ++++++ --- /var/tmp/diff_new_pack.XJKtlX/_old 2010-03-26 01:27:59.000000000 +0100 +++ /var/tmp/diff_new_pack.XJKtlX/_new 2010-03-26 01:27:59.000000000 +0100 @@ -20,7 +20,7 @@ Name: mdadm Version: 3.0.3 -Release: 4 +Release: 5 BuildRequires: sgmltool PreReq: %fillup_prereq %insserv_prereq Obsoletes: raidtools @@ -37,6 +37,7 @@ Source4: boot.md Source5: mkinitrd-setup.sh Source6: mkinitrd-boot.sh +Source7: 64-md-raid.rules %description Mdadm is a program that can be used to control Linux md devices. It is @@ -73,8 +74,8 @@ rm -rf $RPM_BUILD_ROOT/var/run/mdadm mkdir -p $RPM_BUILD_ROOT/var/run ln -s mdadm $RPM_BUILD_ROOT/var/run/mdadm -# remove here, using the one in the udev package -rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/64-md-raid.rules +install -d $RPM_BUILD_ROOT/lib/udev/rules.d +install -m 644 %_sourcedir/64-md-raid.rules $RPM_BUILD_ROOT/lib/udev/rules.d %post [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -117,5 +118,8 @@ %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-md.sh /lib/mkinitrd/scripts/boot-md.sh +%dir /lib/udev +%dir /lib/udev/rules.d +/lib/udev/rules.d/64-md-raid.rules %changelog ++++++ 64-md-raid.rules ++++++ # do not edit this file, it will be overwritten on update SUBSYSTEM!="block", GOTO="md_end" ACTION!="add|change", GOTO="md_end" # import data from a raid member and activate it ENV{ID_FS_TYPE}=="linux_raid_member", PROGRAM="/bin/grep -qs '^AUTO -all' /etc/mdadm.conf", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}" # import data from a raid set KERNEL!="md*", GOTO="md_end" # container devices have a metadata version of e.g. 'external:ddf' and # never leave state 'inactive' ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state" ATTR{md/array_state}=="|clear|inactive", GOTO="md_end" LABEL="md_ignore_state" IMPORT{program}="/sbin/mdadm --detail --export $tempnode" ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" ENV{DEVTYPE}!="partition", GOTO="md_vol_id" IMPORT{program}="/sbin/mdadm --detail --export %r/$parent" ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace" ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n" ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n" ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n" LABEL="md_vol_id" IMPORT{program}="/sbin/blkid -o udev -p $tempnode" OPTIONS+="link_priority=100" ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" LABEL="md_end" ++++++ mkinitrd-boot.sh ++++++ --- /var/tmp/diff_new_pack.XJKtlX/_old 2010-03-26 01:27:59.000000000 +0100 +++ /var/tmp/diff_new_pack.XJKtlX/_new 2010-03-26 01:27:59.000000000 +0100 @@ -42,6 +42,9 @@ { local dev=$1 mdconf container + if test -e "$dev"; then + return + fi case "$dev" in /dev/md[0-9]*p[0-9]*) dev=${dev%p[0-9]*} @@ -84,5 +87,8 @@ if [ -n "$md_dev" ] ; then md_assemble "$md_dev" fi + for dev in $md_devs; do + md_assemble "$dev" + done wait_for_events fi ++++++ mkinitrd-setup.sh ++++++ --- /var/tmp/diff_new_pack.XJKtlX/_old 2010-03-26 01:27:59.000000000 +0100 +++ /var/tmp/diff_new_pack.XJKtlX/_new 2010-03-26 01:27:59.000000000 +0100 @@ -6,7 +6,7 @@ # Full mdadm.conf generated by mdadm. # Contains all created MD RAIDs -mdadm_conf=$(mdadm --examine --brief --scan) +mdadm_conf= cont_list= md_devs= @@ -64,7 +64,10 @@ mdconf="$(mdadm -Db "$container")\\n$mdconf" ;; [0-9a-f]*[0-9a-f]) - mdconf="$(mdadm -Ebs | grep "UUID=$container")\\n$mdconf" + if test -z "$mdadm_conf"; then + mdadm_conf=$(mdadm --examine --brief --scan) + fi + mdconf="$(echo "$mdadm_conf" | grep "UUID=$container")\\n$mdconf" ;; *) echo "unrecognized container for $md_dev: $container" @@ -84,6 +87,10 @@ eval echo -e \"\$md_conf_$md\" >> $tmp_mnt/etc/mdadm.conf done fi +# Remember which arrays are needed for the root or swap device and assemble +# them all during boot. The root= or resume= option might not directly refer to +# the array. +md_devs=$(printf '/dev/%s ' $md_devs) save_var need_mdadm -save_var root_md +save_var md_devs ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '10

26 Mar '10

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Fri Mar 26 01:27:44 CET 2010. -------- --- xorg-x11-server/xorg-x11-server.changes 2010-03-17 06:22:05.000000000 +0100 +++ xorg-x11-server/xorg-x11-server.changes 2010-03-24 17:06:51.000000000 +0100 @@ -1,0 +2,58 @@ +Wed Mar 24 17:05:53 CET 2010 - sndirsch(a)suse.de + +- disabled udev support for openSUSE <= 11.2 (bnc #589997) + +------------------------------------------------------------------- +Wed Mar 24 02:37:56 CET 2010 - ro(a)suse.de + +- re-do xorg-server-walk_drivers.diff again, different approach + create screen sections for each possible drivers + now it is really using the first driver as in full autoconfig + +------------------------------------------------------------------- +Tue Mar 23 14:10:59 CET 2010 - sndirsch(a)suse.de + +- update to 1.7.99.902 +- fixed font path ("--with-fontrootdir") + +------------------------------------------------------------------- +Tue Mar 23 00:07:28 CET 2010 - ro(a)suse.de + +- xserver-1.6.1-nouveau.patch (from fedora) + Also, don't treat DRI setup failure as an error for nouveau. + +------------------------------------------------------------------- +Mon Mar 22 17:48:04 CET 2010 - ro(a)suse.de + +- rework xorg-server-walk_drivers.diff + +------------------------------------------------------------------- +Mon Mar 22 00:23:22 CET 2010 - ro(a)suse.de + +- re-implement walking list of possible drivers to find a working + one + +------------------------------------------------------------------- +Thu Mar 18 02:29:25 CET 2010 - ro(a)suse.de + +- update to 1.7.99 to get rid of hal + - refresh patches + - drop p_ia64-console.diff +- remove hal-devel from buildrequires +- add libudev-devel to buildrequires +- add --enable-config-udev to configure + +------------------------------------------------------------------- +Wed Mar 17 15:56:31 CET 2010 - ro(a)suse.de + +- drop un-applied patches + p_pci-off-by-one.diff.ia64 + xorg-x11-server-1.2.99-unbreak-domain.patch + ia64linuxPciInit.diff + exa-greedy.diff + commit-c941479.diff + moblin-hw-xf86-modes-Set-crtc-mode-rotation-transform-befo.patch + moblin-xfree86-move-didLock-assignment-down-to-where-the-f.patch + moblin-randr-fix-operation-order-so-that-rotation-transfor.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- commit-c941479.diff exa-greedy.diff ia64linuxPciInit.diff moblin-hw-xf86-modes-Set-crtc-mode-rotation-transform-befo.patch moblin-randr-fix-operation-order-so-that-rotation-transfor.patch moblin-xfree86-move-didLock-assignment-down-to-where-the-f.patch p_ia64-console.diff p_pci-off-by-one.diff.ia64 xorg-server-1.7.6.tar.bz2 xorg-x11-server-1.2.99-unbreak-domain.patch New: ---- xorg-server-1.7.99.902.tar.bz2 xorg-server-walk_drivers.diff xorg-server-xf4vnc-fixes_1_8.diff xserver-1.6.1-nouveau.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-server (Version 7.5_1.7.6) +# spec file for package xorg-x11-server (Version 7.5_1.7.99.902) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,13 +20,15 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.7.6 +%define dirsuffix 1.7.99.902 %define fglrx_driver_hack 0 ### FIXME %define vnc 1 -BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel -### HAL/evdev support -BuildRequires: hal-devel +BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-fonts-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel +### udev support (broken on openSUSE 11.2, see also bnc #589997) +%if %suse_version > 1120 +BuildRequires: libudev-devel +%endif %if %vnc BuildRequires: libjpeg-devel %endif @@ -43,8 +45,8 @@ Requires: pkgconfig xorg-x11-fonts-core xorg-x11 %if %suse_version > 1010 %ifnarch s390 s390x -Provides: VIDEO_ABI_VERSION = 6 -Provides: INPUT_ABI_VERSION = 7 +Provides: VIDEO_ABI_VERSION = 7 +Provides: INPUT_ABI_VERSION = 9 Requires: libpixman-1-0 >= 0.15.2 %endif %endif @@ -69,11 +71,9 @@ Patch13: p_xorg_acpi.diff Patch14: p_xkills_wrong_client.diff Patch16: p_xnest-ignore-getimage-errors.diff -Patch18: p_ia64-console.diff Patch23: disable-fbblt-opt.diff Patch27: mouse.diff Patch29: xephyr.diff -Patch34: p_pci-off-by-one.diff.ia64 Patch36: libdrm.diff %if %vnc ### Dan Nicholson <dbn.lists(a)gmail.com> @@ -86,20 +86,18 @@ Patch46: xorg-server-xf4vnc-busyloop.diff Patch47: xorg-server-xf4vnc-clientTimeout.diff Patch48: xorg-server-xf4vnc-fix.diff +Patch49: xorg-server-xf4vnc-fixes_1_8.diff %endif Patch45: bug-197858_dpms.diff -Patch63: xorg-x11-server-1.2.99-unbreak-domain.patch Patch67: xorg-docs.diff Patch77: fbdevhw.diff Patch79: edit_data_sanity_check.diff -Patch83: ia64linuxPciInit.diff Patch93: pixman.diff Patch101: zap_warning_xserver.diff Patch103: confine_to_shape.diff Patch104: bitmap_always_unscaled.diff Patch106: randr1_1-sig11.diff Patch112: fix-dpi-values.diff -Patch118: exa-greedy.diff Patch123: vidmode-sig11.diff Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch Patch127: dpms_screensaver.diff @@ -108,16 +106,14 @@ Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff Patch143: autoconfig_fallback_fbdev_first.diff Patch145: driver-autoconfig.diff -Patch148: commit-c941479.diff +Patch146: xorg-server-walk_drivers.diff +Patch147: xserver-1.6.1-nouveau.patch # Moblin Patch162: cache-xkbcomp-output-for-fast-start-up.patch %if %moblin Patch163: xserver-1.5.0-bg-none-root.patch %endif Patch164: xorg-detect-psb.patch -Patch165: moblin-hw-xf86-modes-Set-crtc-mode-rotation-transform-befo.patch -Patch166: moblin-xfree86-move-didLock-assignment-down-to-where-the-f.patch -Patch167: moblin-randr-fix-operation-order-so-that-rotation-transfor.patch %if %moblin Patch168: moblin-xserver-no-root-2.patch %endif @@ -195,14 +191,9 @@ %patch13 %patch14 %patch16 -p2 -pushd hw/xfree86/os-support -%patch18 -popd %patch23 %patch27 %patch29 -### FIXME -#%patch34 -p0 %patch36 -p0 %if %vnc %patch39 -p1 @@ -213,25 +204,21 @@ %patch46 -p1 %patch47 -p1 %patch48 -p1 +%patch49 -p0 chmod 755 hw/vnc/symlink-vnc.sh %endif %patch45 -p0 -### FIXME -#%patch63 -p1 pushd xorg-docs-* %patch67 popd %patch77 %patch79 -p1 -### FIXME -#%patch83 %patch93 %patch101 -p1 %patch103 %patch104 -p1 %patch106 -p1 %patch112 -p0 -#patch118 -p1 %patch123 -p0 %patch125 -p1 %patch127 -p1 @@ -242,8 +229,8 @@ %patch132 -p1 %patch143 -p0 %patch145 -p0 -### Bug #528397 -#%patch148 -p1 -R +%patch146 -p0 +%patch147 -p1 %patch162 -p1 %if %moblin %patch163 -p1 @@ -321,10 +308,13 @@ --disable-xprint \ --enable-record \ --enable-xcsecurity \ +%if %suse_version > 1120 + --enable-config-udev \ +%endif --with-log-dir="/var/log" \ --with-os-name="openSUSE" \ --with-os-vendor="SUSE LINUX" \ - --with-fontdir="/usr/share/fonts" \ + --with-fontrootdir="/usr/share/fonts" \ --with-xkb-path="/usr/share/X11/xkb" \ --with-xkb-output="/var/lib/xkb/compiled" #make %{?jobs:-j %jobs} ++++++ 0001-Check-harder-for-primary-PCI-device.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -9,15 +9,10 @@ redo the check and also check if IO resoures are also enabled, if this still doesn't turn up a unique result also check for the presence of a BIOS rom. ---- - hw/xfree86/common/xf86pciBus.c | 46 +++++++++++++++++++++++++++++++++++++-- - 1 files changed, 43 insertions(+), 3 deletions(-) - -diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 25b553b..18b9782 100644 ---- a/hw/xfree86/common/xf86pciBus.c -+++ b/hw/xfree86/common/xf86pciBus.c -@@ -390,9 +390,49 @@ xf86PciProbe(void) +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/common/xf86pciBus.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86pciBus.c +@@ -140,9 +140,49 @@ primaryBus.type = BUS_PCI; primaryBus.id.pci = info; } else { @@ -70,6 +65,3 @@ } } } --- -1.6.4.2 - ++++++ 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -6,8 +6,8 @@ The damage structure for the cursor is not deregistered before deallocation, causing a subsequent DamageUnregister () to segfault. ================================================================================ ---- xorg-server-1.7.4/mi/misprite.c -+++ xorg-server-1.7.4/mi/misprite.c +--- xorg-server-1.7.99/mi/misprite.c ++++ xorg-server-1.7.99/mi/misprite.c @@ -384,6 +384,7 @@ pScreen->InstallColormap = pScreenPriv->InstallColormap; pScreen->StoreColors = pScreenPriv->StoreColors; ++++++ 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -6,15 +6,10 @@ In DeleteInputDeviceRequest (xf86Xinput.c), we access idev members even if idev is null. This takes down the xserver hard in some cases (kernel SIGABRT), and segfaults on other cases. ---- - hw/xfree86/common/xf86Xinput.c | 23 +++++++++++++---------- - 1 files changed, 13 insertions(+), 10 deletions(-) - -Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Xinput.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Xinput.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Xinput.c -@@ -679,17 +679,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pD +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/common/xf86Xinput.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86Xinput.c +@@ -870,17 +870,20 @@ else xf86DeleteInput(pInfo, 0); ++++++ autoconfig_fallback_fbdev_first.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86AutoConfig.c -=================================================================== ---- hw/xfree86/common/xf86AutoConfig.c.orig +================================================================================ +--- hw/xfree86/common/xf86AutoConfig.c +++ hw/xfree86/common/xf86AutoConfig.c -@@ -513,7 +513,7 @@ listPossibleVideoDrivers(char *matches[] +@@ -506,7 +506,7 @@ /* Fallback to platform default hardware */ if (i < (nmatches - 1)) { #if defined(__i386__) || defined(__amd64__) || defined(__hurd__) @@ -11,7 +11,7 @@ #elif defined(__sparc__) && !defined(sun) matches[i++] = xnfstrdup("sunffb"); #endif -@@ -524,7 +524,7 @@ listPossibleVideoDrivers(char *matches[] +@@ -517,7 +517,7 @@ #if !defined(__linux__) && defined(__sparc__) matches[i++] = xnfstrdup("wsfb"); #else ++++++ bitmap_always_unscaled.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -17,22 +17,15 @@ Reported by Mike Fabian, debugged and fixed with the help of Mike Fabian and Stefan Dirsch. ---- - configure.ac | 2 +- - hw/xfree86/Makefile.am | 6 +++--- - hw/xfree86/utils/xorgconfig/xorgconfig.c | 4 +--- - 3 files changed, 5 insertions(+), 7 deletions(-) - -Index: xorg-server-1.6.3.901/configure.ac -=================================================================== ---- xorg-server-1.6.3.901.orig/configure.ac -+++ xorg-server-1.6.3.901/configure.ac -@@ -466,7 +466,7 @@ AC_ARG_WITH(builderstring, AS_HELP_STR - AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]), - [ FONTDIR="$withval" ], - [ FONTDIR="${libdir}/X11/fonts" ]) --DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" -+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled" - case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; - esac +================================================================================ +--- xorg-server-1.7.99/configure.ac ++++ xorg-server-1.7.99/configure.ac +@@ -509,7 +509,7 @@ + dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, + dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross + dnl compiling, assume default font path uses standard FONTROOTDIR directories. +-DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" ++DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" + if test "$cross_compiling" != yes; then + AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], + [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], ++++++ bug-197858_dpms.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -10,7 +10,7 @@ struct x_IHRec * next; } IHRec, *IHPtr; -@@ -456,8 +457,12 @@ +@@ -449,8 +450,12 @@ * Keep the order: Disable Device > LeaveVT * EnterVT > EnableDevice */ @@ -25,7 +25,7 @@ for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) { if (pInfo->dev) { xf86ReleaseKeys(pInfo->dev); -@@ -499,8 +504,12 @@ +@@ -492,8 +497,12 @@ EnableDevice(pInfo->dev, TRUE); pInfo = pInfo->next; } @@ -40,7 +40,7 @@ xf86UnblockSIGIO(prevSIGIO); -@@ -556,8 +565,12 @@ +@@ -549,8 +558,12 @@ pInfo = pInfo->next; } @@ -55,7 +55,7 @@ xf86UnblockSIGIO(prevSIGIO); } -@@ -594,8 +607,10 @@ +@@ -587,8 +600,10 @@ { IHPtr ih = addInputHandler(fd, proc, data); ++++++ bug474071-fix1.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -1,8 +1,8 @@ Index: linuxPci.c -=================================================================== ---- linuxPci.c.orig +================================================================================ +--- linuxPci.c +++ linuxPci.c -@@ -274,7 +274,7 @@ get_parent_bridge(struct pci_device *dev +@@ -195,7 +195,7 @@ struct pci_id_match bridge_match = { PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, (PCI_CLASS_BRIDGE << 16) | (PCI_SUBCLASS_BRIDGE_PCI << 8), @@ -11,7 +11,7 @@ }; struct pci_device *bridge; struct pci_device_iterator *iter; -@@ -512,7 +512,6 @@ IOADDRESS +@@ -433,7 +433,6 @@ xf86MapLegacyIO(struct pci_device *dev) { const int domain = dev->domain; @@ -19,7 +19,7 @@ int fd; if (domain >= MAX_DOMAINS) -@@ -520,9 +519,11 @@ xf86MapLegacyIO(struct pci_device *dev) +@@ -441,9 +440,11 @@ if (DomainMmappedIO[domain] == NULL) { /* Permanently map all of I/O space */ ++++++ bug534768-prefer_local_symbols.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/loader/dlloader.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/loader/dlloader.c -+++ xorg-server-1.6.3.901/hw/xfree86/loader/dlloader.c -@@ -120,7 +120,7 @@ DLFindSymbol(const char *name) +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/loader/dlloader.c ++++ xorg-server-1.7.99/hw/xfree86/loader/dlloader.c +@@ -120,7 +120,7 @@ } if (!global_scope) @@ -11,7 +11,7 @@ if (global_scope) return DLFindSymbolLocal(global_scope, name); -@@ -136,9 +136,9 @@ DLLoadModule(loaderPtr modrec, int flags +@@ -136,9 +136,9 @@ int dlopen_flags; if (flags & LD_FLAG_GLOBAL) ++++++ cache-xkbcomp-output-for-fast-start-up.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -9,9 +9,9 @@ Signed-off-by: Yan Li <yan.i.li(a)intel.com> ================================================================================ ---- xorg-server-1.7.4/configure.ac -+++ xorg-server-1.7.4/configure.ac -@@ -502,9 +502,9 @@ +--- xorg-server-1.7.99/configure.ac ++++ xorg-server-1.7.99/configure.ac +@@ -527,9 +527,9 @@ AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]), [ XKBPATH="$withval" ], [ XKBPATH="${datadir}/X11/xkb" ]) @@ -23,7 +23,7 @@ AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], [Keyboard ruleset (default: base/evdev)]), [ XKB_DFLT_RULES="$withval" ], -@@ -1120,7 +1120,7 @@ +@@ -1160,7 +1160,7 @@ dnl Make sure XKM_OUTPUT_DIR is an absolute path XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then @@ -32,8 +32,8 @@ fi dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed ---- xorg-server-1.7.4/xkb/README.compiled -+++ xorg-server-1.7.4/xkb/README.compiled +--- xorg-server-1.7.99/xkb/README.compiled ++++ xorg-server-1.7.99/xkb/README.compiled @@ -4,10 +4,10 @@ or some other tool might destroy or replace the files in this directory, so it is not a safe place to store compiled keymaps for long periods of @@ -49,11 +49,11 @@ Unless the X server is modified, sharing this directory between servers on different hosts could cause problems. ---- xorg-server-1.7.4/xkb/ddxLoad.c -+++ xorg-server-1.7.4/xkb/ddxLoad.c -@@ -32,6 +32,12 @@ +--- xorg-server-1.7.99/xkb/ddxLoad.c ++++ xorg-server-1.7.99/xkb/ddxLoad.c +@@ -30,6 +30,12 @@ + #include <xkb-config.h> - #endif +#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ +# include <sha1.h> @@ -64,7 +64,7 @@ #include <stdio.h> #include <ctype.h> #include <X11/X.h> -@@ -45,24 +51,13 @@ +@@ -43,24 +49,13 @@ #define XKBSRV_NEED_FILE_FUNCS #include <xkbsrv.h> #include <X11/extensions/XI.h> @@ -90,7 +90,7 @@ #define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\"" #define ERROR_PREFIX "\"> \"" #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\"" -@@ -177,6 +172,45 @@ +@@ -175,6 +170,45 @@ } static Bool @@ -136,7 +136,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, XkbComponentNamesPtr names, unsigned want, -@@ -185,7 +219,11 @@ +@@ -183,7 +217,11 @@ int nameRtrnLen) { FILE * out; @@ -149,7 +149,7 @@ const char *emptystring = ""; const char *xkbbasedirflag = emptystring; -@@ -196,15 +234,70 @@ +@@ -194,15 +232,70 @@ /* WIN32 has no popen. The input must be stored in a file which is used as input for xkbcomp. xkbcomp does not read from stdin. */ char tmpname[PATH_MAX]; @@ -166,13 +166,13 @@ + out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w"); + if (NULL == out) { + ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n"); -+ return False; ++ return FALSE; + } + ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need); + if (fclose(out) !=0) + { + ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n"); -+ return False; ++ return FALSE; + } +#ifdef DEBUG + if (xkbDebugFlags) { @@ -182,7 +182,7 @@ #endif + if (!ret) { + ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n"); -+ return False; ++ return FALSE; + } - snprintf(keymap, sizeof(keymap), "server-%s", display); @@ -201,7 +201,7 @@ + /* set nameRtrn, fail if it's too small */ + if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) { + ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n"); -+ return False; ++ return FALSE; + } + strncpy(nameRtrn, xkmfile, nameRtrnLen); + @@ -210,7 +210,7 @@ + if (access(canonicalXkmFileName, R_OK) == 0) { + /* yes, we can reuse the old xkm file */ + LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName); -+ result = True; ++ result = TRUE; + goto _ret; + } + LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName); @@ -223,13 +223,13 @@ #ifdef WIN32 strcpy(tmpname, Win32TempDir()); strcat(tmpname, "\\xkb_XXXXXX"); -@@ -227,19 +320,30 @@ +@@ -225,19 +318,30 @@ } } + if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) { + ErrorF("[xkb] Can't generate temp xkm file name"); -+ result = False; ++ result = FALSE; + goto _ret; + } + @@ -257,7 +257,7 @@ #ifndef WIN32 out= Popen(buf,"w"); #else -@@ -247,31 +351,43 @@ +@@ -245,31 +349,42 @@ #endif if (out!=NULL) { @@ -265,75 +265,76 @@ - if (xkbDebugFlags) { - ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n"); - XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need); -+ /* write XKBKeyMapBuf to xkbcomp */ -+ if (EOF==fputs(xkbKeyMapBuf, out)) -+ { -+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n"); -+ result = False; -+ goto _ret; - } +- } -#endif - XkbWriteXKBKeymapForNames(out,names,xkb,want,need); ++ /* write XKBKeyMapBuf to xkbcomp */ ++ if (EOF==fputs(xkbKeyMapBuf, out)) ++ { ++ ErrorF("[xkb] Sending keymap to xkbcomp failed\n"); ++ result = FALSE; ++ goto _ret; ++ } #ifndef WIN32 if (Pclose(out)==0) #else if (fclose(out)==0 && System(buf) >= 0) #endif { -+ /* xkbcomp success */ ++ /* xkbcomp success */ if (xkbDebugFlags) DebugF("[xkb] xkb executes: %s\n",buf); - if (nameRtrn) { - strncpy(nameRtrn,keymap,nameRtrnLen); - nameRtrn[nameRtrnLen-1]= '\0'; -+ -+ /* if canonicalXkmFileName already exists now, we simply -+ overwrite it, this is OK */ -+ ret = rename(tmpXkmFile, canonicalXkmFileName); -+ if (0 != ret) { -+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n", -+ tmpXkmFile, canonicalXkmFileName, -+ strerror(errno)); -+ -+ /* in case of error, don't unlink tmpXkmFile, leave it -+ for debugging */ -+ -+ result = False; -+ goto _ret; - } +- } - if (buf != NULL) - xfree (buf); -- return True; +- return TRUE; ++ /* if canonicalXkmFileName already exists now, we simply ++ overwrite it, this is OK */ ++ ret = rename(tmpXkmFile, canonicalXkmFileName); ++ if (0 != ret) { ++ ErrorF("[xkb] Can't rename %s to %s, error: %s\n", ++ tmpXkmFile, canonicalXkmFileName, ++ strerror(errno)); ++ ++ /* in case of error, don't unlink tmpXkmFile, leave it ++ for debugging */ ++ ++ result = FALSE; ++ goto _ret; ++ } + -+ result = True; -+ goto _ret; ++ result = TRUE; ++ goto _ret; } else - LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap); -+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile); ++ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile); #ifdef WIN32 /* remove the temporary file */ unlink(tmpname); -@@ -286,9 +402,17 @@ - } - if (nameRtrn) +@@ -286,7 +401,17 @@ nameRtrn[0]= '\0'; -+ result = False; + if (buf != NULL) + xfree (buf); +- return FALSE; ++ result = FALSE; + +_ret: + if (tmpXkmFile) -+ free(tmpXkmFile); ++ free(tmpXkmFile); + if (canonicalXkmFileName) -+ xfree(canonicalXkmFileName); - if (buf != NULL) - xfree (buf); -- return False; ++ xfree(canonicalXkmFileName); ++ if (buf != NULL) ++ xfree (buf); + + return result; } static FILE * -@@ -372,7 +496,6 @@ +@@ -370,7 +495,6 @@ DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined); } fclose(file); ++++++ confine_to_shape.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: dix/events.c -=================================================================== ---- dix/events.c.orig +================================================================================ +--- dix/events.c +++ dix/events.c -@@ -803,37 +803,80 @@ ConfineToShape(DeviceIntPtr pDev, Region +@@ -661,37 +661,80 @@ { BoxRec box; int x = *px, y = *py; ++++++ disable-fbblt-opt.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: fb/fbblt.c -=================================================================== ---- fb/fbblt.c.orig +================================================================================ +--- fb/fbblt.c +++ fb/fbblt.c -@@ -76,6 +76,11 @@ fbBlt (FbBits *srcLine, +@@ -76,6 +76,11 @@ } #endif @@ -14,7 +14,7 @@ if (alu == GXcopy && pm == FB_ALLONES && !reverse && !(srcX & 7) && !(dstX & 7) && !(width & 7)) { int i; -@@ -97,6 +102,7 @@ fbBlt (FbBits *srcLine, +@@ -97,6 +102,7 @@ return; } ++++++ dpms_screensaver.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86DPMS.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86DPMS.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86DPMS.c -@@ -160,7 +160,8 @@ DPMSSet(ClientPtr client, int level) +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/common/xf86DPMS.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86DPMS.c +@@ -156,7 +156,8 @@ rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive); if (rc != Success) return rc; ++++++ driver-autoconfig.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -19,7 +19,7 @@ case 0x10c8: driverList[0] = "neomagic"; break; - case 0x10de: case 0x12d2: driverList[0] = "nv"; break; - case 0x1106: driverList[0] = "openchrome"; break; -+ case 0x12d2: driverList[0] = "nv"; break; ++ case 0x12d2: driverList[0] = "nv"; break; + case 0x10de: + driverList[0] = "nvidia"; + driverList[1] = "nouveau"; @@ -33,6 +33,6 @@ + driverList[1] = "openchrome"; + driverList[2] = "unichrome"; + break; + case 0x1b36: driverList[0] = "qxl"; break; case 0x1163: driverList[0] = "rendition"; break; case 0x5333: - switch (dev->device_id) ++++++ edit_data_sanity_check.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,19 +1,21 @@ Index: xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/modes/xf86Crtc.c -+++ xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c -@@ -2800,7 +2800,13 @@ xf86OutputSetEDID (xf86OutputPtr output, - for (i = 0; i < 4; i++) { - if (edid_mon->det_mon[i].type == DT && - edid_mon->det_mon[i].section.d_timings.h_size != 0 && -- edid_mon->det_mon[i].section.d_timings.v_size != 0) -+ edid_mon->det_mon[i].section.d_timings.v_size != 0 && -+ /* some sanity checking for aspect ration */ -+ ((edid_mon->det_mon[i].section.d_timings.h_size / -+ edid_mon->det_mon[i].section.d_timings.v_size) < 2) && -+ ((edid_mon->det_mon[i].section.d_timings.v_size / -+ edid_mon->det_mon[i].section.d_timings.h_size) < 2) -+ ) - { - output->mm_width = edid_mon->det_mon[i].section.d_timings.h_size; - output->mm_height = edid_mon->det_mon[i].section.d_timings.v_size; +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/modes/xf86Crtc.c ++++ xorg-server-1.7.99/hw/xfree86/modes/xf86Crtc.c +@@ -2916,8 +2916,14 @@ + p->output->MonInfo->features.vsize); + if (det_mon->type == DT && + det_mon->section.d_timings.h_size != 0 && +- det_mon->section.d_timings.v_size != 0) { +- ++ det_mon->section.d_timings.v_size != 0 && ++ det_mon->section.d_timings.v_size != 0 && ++ /* some sanity checking for aspect ration */ ++ ((det_mon->section.d_timings.h_size / ++ det_mon->section.d_timings.v_size) < 2) && ++ ((det_mon->section.d_timings.v_size / ++ det_mon->section.d_timings.h_size) < 2) ++ ) { + p->output->mm_width = det_mon->section.d_timings.h_size; + p->output->mm_height = det_mon->section.d_timings.v_size; + p->ret = TRUE; ++++++ fbdevhw.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/fbdevhw/fbdevhw.c -=================================================================== ---- hw/xfree86/fbdevhw/fbdevhw.c.orig +================================================================================ +--- hw/xfree86/fbdevhw/fbdevhw.c +++ hw/xfree86/fbdevhw/fbdevhw.c -@@ -964,9 +964,10 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mo +@@ -957,9 +957,10 @@ return; } @@ -15,7 +15,7 @@ } Bool -@@ -982,9 +983,10 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int +@@ -975,9 +976,10 @@ unblank = xf86IsUnblank(mode); ++++++ fix-dpi-values.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86Helper.c -=================================================================== ---- hw/xfree86/common/xf86Helper.c.orig +================================================================================ +--- hw/xfree86/common/xf86Helper.c +++ hw/xfree86/common/xf86Helper.c -@@ -997,12 +997,22 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int +@@ -974,12 +974,22 @@ } else if (pScrn->widthmm > 0 || pScrn->heightmm > 0) { from = X_CONFIG; if (pScrn->widthmm > 0) { @@ -29,7 +29,7 @@ } if (pScrn->xDpi > 0 && pScrn->yDpi <= 0) pScrn->yDpi = pScrn->xDpi; -@@ -1037,12 +1047,22 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int +@@ -1014,12 +1024,22 @@ pScrn->widthmm = ddcWidthmm; pScrn->heightmm = ddcHeightmm; if (pScrn->widthmm > 0) { ++++++ fixed-SYNC-extension-trigger-BlockHandler-test.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -26,8 +26,8 @@ expires unnoticed. Index: xorg-server-1.6.3.901/Xext/sync.c ================================================================================ ---- xorg-server-1.7.4/Xext/sync.c -+++ xorg-server-1.7.4/Xext/sync.c +--- xorg-server-1.7.99/Xext/sync.c ++++ xorg-server-1.7.99/Xext/sync.c @@ -94,7 +94,7 @@ #define XSyncCAAllTrigger \ (XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType) @@ -188,7 +188,7 @@ } /* end for each trigger */ if (pnewgtval || pnewltval) -@@ -2273,11 +2269,17 @@ +@@ -2277,11 +2273,17 @@ } static void @@ -211,7 +211,7 @@ if (!pIdleTimeValueLess && !pIdleTimeValueGreater) return; -@@ -2295,46 +2297,57 @@ +@@ -2299,46 +2301,57 @@ * want level or edge trigger. Check the trigger list against the * current idle time, and if any succeed, bomb out of select() * immediately so we can reschedule. ++++++ fpic.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -2,7 +2,7 @@ ================================================================================ --- hw/xfree86/parser/Makefile.am +++ hw/xfree86/parser/Makefile.am -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ $(INTERNAL_SOURCES) libxf86config_a_CFLAGS = $(AM_CFLAGS) ++++++ libdrm.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86Helper.c -=================================================================== ---- hw/xfree86/common/xf86Helper.c.orig +================================================================================ +--- hw/xfree86/common/xf86Helper.c +++ hw/xfree86/common/xf86Helper.c -@@ -2251,6 +2251,13 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, con +@@ -2183,6 +2183,13 @@ &errmaj, &errmin); if (!ret) LoaderErrorMsg(pScrn->name, name, errmaj, errmin); ++++++ missing_font_paths.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,11 +1,17 @@ --- configure.ac +++ configure.ac -@@ -491,7 +491,7 @@ - AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]), - [ FONTDIR="$withval" ], - [ FONTDIR="${libdir}/X11/fonts" ]) --DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled" -+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled,${FONTDIR}/URW,${FONTDIR}/cyrillic" - case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; - esac +@@ -505,11 +505,13 @@ + XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1) + XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi) + XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi) ++XORG_FONTSUBDIR(FONTURWDIR, fonturwdir, URW) ++XORG_FONTSUBDIR(FONTCYRILLICDIR, fontcyrillicdir, cyrillic) + + dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, + dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross + dnl compiling, assume default font path uses standard FONTROOTDIR directories. +-DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" ++DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/,${FONTURWDIR}/,${FONTCYRILLICDIR}/" + if test "$cross_compiling" != yes; then + AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], + [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], ++++++ moblin-xorg-x11-nonroot-vesa.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86AutoConfig.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c -@@ -545,7 +545,8 @@ listPossibleVideoDrivers(char *matches[] +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/common/xf86AutoConfig.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86AutoConfig.c +@@ -535,7 +535,8 @@ #if !defined(__linux__) && defined(__sparc__) matches[i++] = xnfstrdup("wsfb"); #else ++++++ mouse.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86Configure.c -=================================================================== ---- hw/xfree86/common/xf86Configure.c.orig +================================================================================ +--- hw/xfree86/common/xf86Configure.c +++ hw/xfree86/common/xf86Configure.c -@@ -80,8 +80,8 @@ static char *DFLT_MOUSE_DEV = "/dev/mous +@@ -64,8 +64,8 @@ static char *DFLT_MOUSE_DEV = "/dev/sysmouse"; static char *DFLT_MOUSE_PROTO = "auto"; #elif defined(linux) ++++++ p_bug96328.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,31 +1,30 @@ Index: hw/xfree86/common/xf86Configure.c -=================================================================== ---- hw/xfree86/common/xf86Configure.c.orig +================================================================================ +--- hw/xfree86/common/xf86Configure.c +++ hw/xfree86/common/xf86Configure.c -@@ -237,23 +237,36 @@ configureInputSection (void) +@@ -250,23 +250,35 @@ /* Crude mechanism to auto-detect mouse (os dependent) */ { - int fd; + int fd = -1; -+ #ifdef WSCONS_SUPPORT - fd = open("/dev/wsmouse", 0); -- if (fd > 0) { +- if (fd >= 0) { - DFLT_MOUSE_DEV = "/dev/wsmouse"; - DFLT_MOUSE_PROTO = "wsmouse"; - close(fd); - } else { - ErrorF("cannot open /dev/wsmouse\n"); -+ if (fd == -1) { -+ fd = open("/dev/wsmouse", 0); -+ if (fd != -1) { -+ DFLT_MOUSE_DEV = "/dev/wsmouse"; -+ DFLT_MOUSE_PROTO = "wsmouse"; -+ close(fd); -+ } else { -+ ErrorF("cannot open /dev/wsmouse\n"); -+ } ++ if (fd == -1) { ++ fd = open("/dev/wsmouse", 0); ++ if (fd != -1) { ++ DFLT_MOUSE_DEV = "/dev/wsmouse"; ++ DFLT_MOUSE_PROTO = "wsmouse"; ++ close(fd); ++ } else { ++ ErrorF("cannot open /dev/wsmouse\n"); ++ } } #endif @@ -34,20 +33,20 @@ - if (fd != -1) { - foundMouse = TRUE; - close(fd); -+ if (fd == -1) { -+ fd = open(DFLT_MOUSE_DEV, 0); ++ if (fd == -1) { ++ fd = open(DFLT_MOUSE_DEV, 0); +# ifdef linux -+ if (fd == -1) { -+ char *name = "/dev/input/mice"; -+ fd = open(name, 0); -+ if (fd != -1) -+ DFLT_MOUSE_DEV = name; -+ } ++ if (fd == -1) { ++ char *name = "/dev/input/mice"; ++ fd = open(name, 0); ++ if (fd != -1) ++ DFLT_MOUSE_DEV = name; ++ } +# endif -+ if (fd != -1) { -+ foundMouse = TRUE; -+ close(fd); -+ } ++ if (fd != -1) { ++ foundMouse = TRUE; ++ close(fd); ++ } } #else foundMouse = TRUE; ++++++ p_default-module-path.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -2,10 +2,10 @@ ================================================================================ --- hw/xfree86/common/xf86Globals.c +++ hw/xfree86/common/xf86Globals.c -@@ -143,7 +143,7 @@ - #endif +@@ -144,7 +144,7 @@ }; const char *xf86ConfigFile = NULL; + const char *xf86ConfigDir = NULL; -const char *xf86ModulePath = DEFAULT_MODULE_PATH; +const char *xf86ModulePath = DEFAULT_MODULE_PATH "/updates," DEFAULT_MODULE_PATH; MessageType xf86ModPathFrom = X_DEFAULT; ++++++ p_xkills_wrong_client.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: os/connection.c -=================================================================== ---- os/connection.c.orig +================================================================================ +--- os/connection.c +++ os/connection.c -@@ -1009,7 +1009,7 @@ CheckConnections(void) +@@ -999,7 +999,7 @@ do { r = Select (curclient + 1, &tmask, NULL, NULL, &notime); } while (r < 0 && (errno == EINTR || errno == EAGAIN)); ++++++ p_xnest-ignore-getimage-errors.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: build-GucBkyZ/xorg-server-1.6.3.901/hw/xnest/GCOps.c -=================================================================== ---- build-GucBkyZ/xorg-server-1.6.3.901.orig/hw/xnest/GCOps.c -+++ build-GucBkyZ/xorg-server-1.6.3.901/hw/xnest/GCOps.c -@@ -94,6 +94,13 @@ xnestPutImage(DrawablePtr pDrawable, GCP +================================================================================ +--- BUILD/xorg-server-1.7.99/hw/xnest/GCOps.c ++++ BUILD/xorg-server-1.7.99/hw/xnest/GCOps.c +@@ -94,6 +94,13 @@ } } @@ -16,7 +16,7 @@ void xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h, unsigned int format, unsigned long planeMask, -@@ -101,9 +108,13 @@ xnestGetImage(DrawablePtr pDrawable, int +@@ -101,9 +108,13 @@ { XImage *ximage; int length; ++++++ p_xorg_acpi.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -104,7 +104,7 @@ #endif #ifdef HAVE_APM -@@ -150,6 +151,14 @@ +@@ -149,6 +150,14 @@ ret = lnxAPMOpen(); #endif ++++++ pci-legacy-mem-fallback.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/os-support/bus/linuxPci.c -=================================================================== ---- hw/xfree86/os-support/bus/linuxPci.c.orig +================================================================================ +--- hw/xfree86/os-support/bus/linuxPci.c +++ hw/xfree86/os-support/bus/linuxPci.c -@@ -476,6 +476,7 @@ xf86MapDomainMemory(int ScreenNum, int F +@@ -397,6 +397,7 @@ * legacy_mem interface is unavailable. */ if ((Base > 1024*1024) || ((fd = linuxOpenLegacy(dev, "legacy_mem")) < 0)) @@ -10,7 +10,7 @@ return linuxMapPci(ScreenNum, Flags, dev, Base, Size, PCIIOC_MMAP_IS_MEM); else -@@ -484,6 +485,8 @@ xf86MapDomainMemory(int ScreenNum, int F +@@ -405,6 +406,8 @@ if (fd >= 0) close(fd); if (addr == NULL || addr == MAP_FAILED) { ++++++ pixman.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: include/miscstruct.h -=================================================================== ---- include/miscstruct.h.orig +================================================================================ +--- include/miscstruct.h +++ include/miscstruct.h -@@ -50,7 +50,7 @@ SOFTWARE. +@@ -50,7 +50,7 @@ #include "misc.h" #include <X11/Xprotostr.h> ++++++ pu_fixes.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/xaa/xaaImage.c -=================================================================== ---- hw/xfree86/xaa/xaaImage.c.orig +================================================================================ +--- hw/xfree86/xaa/xaaImage.c +++ hw/xfree86/xaa/xaaImage.c -@@ -238,12 +238,16 @@ BAD_ALIGNMENT: +@@ -238,12 +238,16 @@ (*infoRec->SetupForImageWrite)(pScrn, rop, planemask, trans, bpp, depth); (*infoRec->SubsequentImageWriteRect)(pScrn, x, y, w, h, skipleft); ++++++ randr1_1-sig11.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86RandR.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86RandR.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86RandR.c -@@ -246,6 +246,9 @@ xf86RandRSetConfig (ScreenPtr pScreen, +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/common/xf86RandR.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86RandR.c +@@ -247,6 +247,9 @@ Bool useVirtual = FALSE; Rotation oldRotation = randrp->rotation; ++++++ vidmode-sig11.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86VidMode.c -=================================================================== ---- hw/xfree86/common/xf86VidMode.c.orig +================================================================================ +--- hw/xfree86/common/xf86VidMode.c +++ hw/xfree86/common/xf86VidMode.c -@@ -226,6 +226,8 @@ VidModeGetFirstModeline(int scrnIndex, p +@@ -220,6 +220,8 @@ pScrn = xf86Screens[scrnIndex]; pVidMode = VMPTR(pScrn->pScreen); ++++++ xephyr.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,6 +1,6 @@ Index: hw/kdrive/Makefile.am -=================================================================== ---- hw/kdrive/Makefile.am.orig +================================================================================ +--- hw/kdrive/Makefile.am +++ hw/kdrive/Makefile.am @@ -1,5 +1,5 @@ if BUILD_KDRIVEFBDEVLIB @@ -9,9 +9,9 @@ endif if XFAKESERVER -@@ -21,8 +21,7 @@ endif +@@ -16,8 +16,7 @@ + SERVER_SUBDIRS = \ - $(XSDL_SUBDIRS) \ $(FBDEV_SUBDIRS) \ - $(XEPHYR_SUBDIRS) \ - $(XFAKE_SUBDIRS) ++++++ xorg-detect-psb.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,7 +1,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c ================================================================================ ---- xorg-server-1.7.4/hw/xfree86/common/xf86AutoConfig.c -+++ xorg-server-1.7.4/hw/xfree86/common/xf86AutoConfig.c +--- xorg-server-1.7.99/hw/xfree86/common/xf86AutoConfig.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86AutoConfig.c @@ -186,12 +186,14 @@ case 0x3d3d: driverList[0] = "glint"; break; case 0x105d: driverList[0] = "i128"; break; ++++++ xorg-docs.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,6 +1,6 @@ Index: Makefile.am -=================================================================== ---- Makefile.am.orig +================================================================================ +--- Makefile.am +++ Makefile.am @@ -20,11 +20,9 @@ # @@ -15,9 +15,7 @@ EXTRA_DIST = \ MAINTAINERS \ misc/xlogo.epsi \ -Index: man/general/Makefile.am -=================================================================== ---- man/general/Makefile.am.orig +--- man/general/Makefile.am +++ man/general/Makefile.am @@ -23,13 +23,8 @@ miscmandir = $(MISC_MAN_DIR) ++++++ xorg-server-1.7.6.tar.bz2 -> xorg-server-1.7.99.902.tar.bz2 ++++++ ++++ 208449 lines of diff (skipped) ++++++ xorg-server-walk_drivers.diff ++++++ --- hw/xfree86/common/xf86AutoConfig.c +++ hw/xfree86/common/xf86AutoConfig.c @@ -539,34 +541,13 @@ } } -static char* -chooseVideoDriver(void) -{ - char *chosen_driver = NULL; - int i; - char *matches[20]; /* If we have more than 20 drivers we're in trouble */ - - listPossibleVideoDrivers(matches, 20); - - /* TODO Handle multiple drivers claiming to support the same PCI ID */ - chosen_driver = matches[0]; - - xf86Msg(X_DEFAULT, "Matched %s for the autoconfigured driver\n", - chosen_driver); - - for (i = 0; matches[i] ; i++) { - if (matches[i] != chosen_driver) { - xfree(matches[i]); - } - } - - return chosen_driver; -} - GDevPtr autoConfigDevice(GDevPtr preconf_device) { - GDevPtr ptr = NULL; + GDevPtr ptr = NULL, cptr = NULL; + char *matches[20]; /* If we have more than 20 drivers we're in trouble */ + int num_matches = 0, num_screens = 0, i; + screenLayoutPtr slp; if (!xf86configptr) { return NULL; @@ -589,14 +571,49 @@ ptr->driver = NULL; } if (!ptr->driver) { - ptr->driver = chooseVideoDriver(); + listPossibleVideoDrivers(matches, 20); + for (; matches[num_matches] ; num_matches++); + slp = xf86ConfigLayout.screens; + if (slp) { + for (; slp[num_screens].screen ; num_screens++); + xf86ConfigLayout.screens = xnfcalloc(1,(num_screens+num_matches+1) * sizeof(screenLayoutRec)); + xf86ConfigLayout.screens[0] = slp[0]; + } + for (i=0; i<num_matches;i++) { + if (i==0) { + ptr->driver = matches[0]; + if (slp && !xf86ConfigLayout.screens[0].screen->device) { + xf86ConfigLayout.screens[0].screen->device = ptr; + ptr->myScreenSection = xf86ConfigLayout.screens[0].screen; + } + } else { + if (slp) { + xf86ConfigLayout.screens[i].screen = xnfcalloc(1, sizeof(confScreenRec)); + if(!xf86ConfigLayout.screens[i].screen) + return NULL; + memcpy(xf86ConfigLayout.screens[i].screen, slp[0].screen, sizeof(confScreenRec)); + } + cptr = xcalloc(1, sizeof(GDevRec)); + if (!cptr) + return NULL; + memcpy(cptr, ptr, sizeof(GDevRec)); + cptr->identifier = xnfcalloc(1,strlen("Autoconfigured Video Device ")+strlen(matches[i])+1); + sprintf(cptr->identifier, "Autoconfigured Video Device %s", matches[i]); + cptr->driver = matches[i]; + if (slp) { + xf86ConfigLayout.screens[i].screen->device = cptr; + cptr->myScreenSection = xf86ConfigLayout.screens[i].screen; + } + } + } + for (i=1;i<num_screens;i++) { + xf86ConfigLayout.screens[i+num_matches] = slp[i]; + } + xf86ConfigLayout.screens[num_screens+num_matches].screen = NULL; + xfree(slp); } - /* TODO Handle multiple screen sections */ - if (xf86ConfigLayout.screens && !xf86ConfigLayout.screens->screen->device) { - xf86ConfigLayout.screens->screen->device = ptr; - ptr->myScreenSection = xf86ConfigLayout.screens->screen; - } + /* TODO Handle rest of multiple screen sections */ xf86Msg(X_DEFAULT, "Assigned the driver to the xf86ConfigLayout\n"); return ptr; ++++++ xorg-server-xf4vnc-TranslateNone.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/translate.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/vnc/translate.c -+++ xorg-server-1.6.3.901/hw/vnc/translate.c -@@ -168,17 +168,17 @@ rfbTranslateNone(ScreenPtr pScreen, char +================================================================================ +--- xorg-server-1.7.99/hw/vnc/translate.c ++++ xorg-server-1.7.99/hw/vnc/translate.c +@@ -168,17 +168,17 @@ { VNCSCREENPTR(pScreen); DrawablePtr pDraw = (DrawablePtr)WindowTable[pScreen->myNum]; ++++++ xorg-server-xf4vnc-abi-version.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/vnc/vncInit.c -=================================================================== ---- hw/xfree86/vnc/vncInit.c.orig +================================================================================ +--- hw/xfree86/vnc/vncInit.c +++ hw/xfree86/vnc/vncInit.c -@@ -573,8 +573,8 @@ static XF86ModuleVersionInfo vncVersRec +@@ -573,8 +573,8 @@ #if 0 ABI_EXTENSION_VERSION, #else @@ -13,11 +13,9 @@ #endif MOD_CLASS_EXTENSION, {0,0,0,0} -Index: xcliplist/cliplistmod.c -=================================================================== ---- xcliplist/cliplistmod.c.orig +--- xcliplist/cliplistmod.c +++ xcliplist/cliplistmod.c -@@ -26,8 +26,8 @@ static XF86ModuleVersionInfo VersRec = { +@@ -26,8 +26,8 @@ #if 0 ABI_EXTENSION_VERSION, #else ++++++ xorg-server-xf4vnc-busyloop.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/sockets.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/vnc/sockets.c -+++ xorg-server-1.6.3.901/hw/vnc/sockets.c -@@ -448,7 +448,7 @@ WriteExact(sock, buf, len) +================================================================================ +--- xorg-server-1.7.99/hw/vnc/sockets.c ++++ xorg-server-1.7.99/hw/vnc/sockets.c +@@ -448,7 +448,7 @@ int n; fd_set fds; struct timeval tv; @@ -11,7 +11,7 @@ int totalTimeWaited = 0; #endif -@@ -470,7 +470,7 @@ WriteExact(sock, buf, len) +@@ -470,7 +470,7 @@ return n; } @@ -20,7 +20,7 @@ /* Retry every 5 seconds until we exceed rfbMaxClientWait. We need to do this because select doesn't necessarily return immediately when the other end has gone away */ -@@ -488,7 +488,7 @@ WriteExact(sock, buf, len) +@@ -488,7 +488,7 @@ tv.tv_usec = 0; #endif n = select(sock+1, NULL, &fds, NULL, &tv); ++++++ xorg-server-xf4vnc-clientTimeout.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/sockets.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/vnc/sockets.c -+++ xorg-server-1.6.3.901/hw/vnc/sockets.c -@@ -490,8 +490,10 @@ WriteExact(sock, buf, len) +================================================================================ +--- xorg-server-1.7.99/hw/vnc/sockets.c ++++ xorg-server-1.7.99/hw/vnc/sockets.c +@@ -490,8 +490,10 @@ n = select(sock+1, NULL, &fds, NULL, &tv); #if 1 if (n < 0) { ++++++ xorg-server-xf4vnc-cutpaste.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/vnc/cutpaste.c -=================================================================== ---- hw/vnc/cutpaste.c.orig +================================================================================ +--- hw/vnc/cutpaste.c +++ hw/vnc/cutpaste.c -@@ -58,7 +58,7 @@ rfbSetXCutText(char *str, int len) +@@ -58,7 +58,7 @@ 8, PropModeReplace, len, (pointer)str, TRUE); ++++++ xorg-server-xf4vnc-fix.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c ================================================================================ ---- xorg-server-1.7.4/configure.ac -+++ xorg-server-1.7.4/configure.ac -@@ -1407,7 +1407,7 @@ +--- xorg-server-1.7.99/configure.ac ++++ xorg-server-1.7.99/configure.ac +@@ -1504,7 +1504,7 @@ XVNC_CFLAGS="-DVNCSERVER -DHAVE_XVNC_CONFIG_H" AC_SUBST([XVNC_CFLAGS]) VNC_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC" @@ -11,8 +11,8 @@ AC_SUBST([XVNC_LIBS]) if test "x$GLX" = xyes; then ---- xorg-server-1.7.4/hw/vnc/cursor.c -+++ xorg-server-1.7.4/hw/vnc/cursor.c +--- xorg-server-1.7.99/hw/vnc/cursor.c ++++ xorg-server-1.7.99/hw/vnc/cursor.c @@ -33,6 +33,7 @@ #include "sprite.h" #include "cursorstr.h" @@ -30,8 +30,8 @@ #else rfbSpriteGetCursorPos(pScreen, &x, &y); #endif ---- xorg-server-1.7.4/hw/vnc/cutpaste.c -+++ xorg-server-1.7.4/hw/vnc/cutpaste.c +--- xorg-server-1.7.99/hw/vnc/cutpaste.c ++++ xorg-server-1.7.99/hw/vnc/cutpaste.c @@ -66,7 +66,7 @@ event.u.selectionClear.time = GetTimeInMillis(); event.u.selectionClear.window = pSel->window; @@ -41,8 +41,8 @@ NoEventMask, NoEventMask /* CantBeFiltered */, NullGrab); } ---- xorg-server-1.7.4/hw/vnc/dispcur.c -+++ xorg-server-1.7.4/hw/vnc/dispcur.c +--- xorg-server-1.7.99/hw/vnc/dispcur.c ++++ xorg-server-1.7.99/hw/vnc/dispcur.c @@ -74,7 +74,10 @@ /* per-screen private data */ @@ -118,8 +118,8 @@ if (!pPriv) { pPriv = rfbDCRealize(pScreen, pCursor); ---- xorg-server-1.7.4/hw/vnc/init.c -+++ xorg-server-1.7.4/hw/vnc/init.c +--- xorg-server-1.7.99/hw/vnc/init.c ++++ xorg-server-1.7.99/hw/vnc/init.c @@ -90,6 +90,7 @@ #include "dix.h" #include "micmap.h" @@ -186,8 +186,8 @@ vncSetPointerDevice(pDevice); break; ---- xorg-server-1.7.4/hw/vnc/kbdptr.c -+++ xorg-server-1.7.4/hw/vnc/kbdptr.c +--- xorg-server-1.7.99/hw/vnc/kbdptr.c ++++ xorg-server-1.7.99/hw/vnc/kbdptr.c @@ -39,6 +39,7 @@ #include "mi.h" #include "mipointer.h" @@ -310,8 +310,8 @@ if (KEY_IS_PRESSED(SHIFT_L_KEY_CODE)) { fakeShiftLRelease = TRUE; EnqueueKey(kbdDevice, KeyRelease, SHIFT_L_KEY_CODE); ---- xorg-server-1.7.4/hw/vnc/rdp.c -+++ xorg-server-1.7.4/hw/vnc/rdp.c +--- xorg-server-1.7.99/hw/vnc/rdp.c ++++ xorg-server-1.7.99/hw/vnc/rdp.c @@ -27,6 +27,7 @@ #include <errno.h> #include <netinet/in.h> @@ -320,8 +320,8 @@ #include "rfb.h" typedef struct rdpClientRec { ---- xorg-server-1.7.4/hw/vnc/rfbkeyb.c -+++ xorg-server-1.7.4/hw/vnc/rfbkeyb.c +--- xorg-server-1.7.99/hw/vnc/rfbkeyb.c ++++ xorg-server-1.7.99/hw/vnc/rfbkeyb.c @@ -147,7 +147,7 @@ #ifdef XKB if (noXkbExtension) { @@ -340,8 +340,8 @@ 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, ---- xorg-server-1.7.4/hw/vnc/rfbmouse.c -+++ xorg-server-1.7.4/hw/vnc/rfbmouse.c +--- xorg-server-1.7.99/hw/vnc/rfbmouse.c ++++ xorg-server-1.7.99/hw/vnc/rfbmouse.c @@ -51,7 +51,7 @@ #include <mipointer.h> #endif @@ -403,8 +403,8 @@ 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, ---- xorg-server-1.7.4/hw/vnc/rfbserver.c -+++ xorg-server-1.7.4/hw/vnc/rfbserver.c +--- xorg-server-1.7.99/hw/vnc/rfbserver.c ++++ xorg-server-1.7.99/hw/vnc/rfbserver.c @@ -53,6 +53,7 @@ #include "propertyst.h" #include <X11/Xatom.h> @@ -424,8 +424,8 @@ } #endif ---- xorg-server-1.7.4/hw/vnc/sprite.c -+++ xorg-server-1.7.4/hw/vnc/sprite.c +--- xorg-server-1.7.99/hw/vnc/sprite.c ++++ xorg-server-1.7.99/hw/vnc/sprite.c @@ -112,7 +112,8 @@ static RegionPtr rfbSpriteRestoreAreas(WindowPtr pWin, RegionPtr pRgnExposed); static void rfbSpriteComputeSaved(ScreenPtr pScreen); @@ -553,8 +553,8 @@ /* send new cursor shape to interested viewers */ for (cl = rfbClientHead; cl ; cl = cl->next) { ---- xorg-server-1.7.4/hw/vnc/vncext.c -+++ xorg-server-1.7.4/hw/vnc/vncext.c +--- xorg-server-1.7.99/hw/vnc/vncext.c ++++ xorg-server-1.7.99/hw/vnc/vncext.c @@ -36,8 +36,9 @@ #include <arpa/inet.h> #include <netdb.h> @@ -594,8 +594,8 @@ NoEventMask, NullGrab); } pn = pn->next; ---- xorg-server-1.7.4/hw/xfree86/vnc/vncInit.c -+++ xorg-server-1.7.4/hw/xfree86/vnc/vncInit.c +--- xorg-server-1.7.99/hw/xfree86/vnc/vncInit.c ++++ xorg-server-1.7.99/hw/xfree86/vnc/vncInit.c @@ -34,8 +34,7 @@ #include "xf86.h" ++++++ xorg-server-xf4vnc-fixes_1_8.diff ++++++ --- hw/vnc/vncext.c +++ hw/vnc/vncext.c @@ -140,7 +140,7 @@ if (rec) { rec->client = client; rec->fakeID = FakeClientID(client->index); - rec->res = CreateNewResourceType(VncDestroyClientResourceCallback); + rec->res = CreateNewResourceType(VncDestroyClientResourceCallback,"DestroyClientResourceCallback"); if (!AddResource(rec->fakeID, rec->res, rec)) { xfree(rec); } @@ -689,7 +689,7 @@ VncResourceGeneration = serverGeneration; - if (!(VncNotifyList = CreateNewResourceType(VncDestroyNotifyList))) { + if (!(VncNotifyList = CreateNewResourceType(VncDestroyNotifyList,"DestroyNotifyList"))) { ErrorF("CreateResourceTypes: failed to allocate vnc notify list resource.\n"); return FALSE; } --- hw/vnc/init.c +++ hw/vnc/init.c @@ -984,6 +984,11 @@ } void +CloseInput() +{ +} + +void OsVendorInit() { } @@ -1047,7 +1052,7 @@ } int -NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) +NewInputDeviceRequest(InputOption *options, InputAttributes *attrs, DeviceIntPtr *pdev) { return BadValue; } ++++++ xorg-server-xf4vnc.patch ++++++ ++++ 800 lines (skipped) ++++ between xorg-x11-server/xorg-server-xf4vnc.patch ++++ and xorg-x11-server/xorg-server-xf4vnc.patch ++++++ xserver-1.6.1-nouveau.patch ++++++ Also, don't treat DRI setup failure as an error for nouveau. --- diff --git a/glx/glxdri.c b/glx/glxdri.c index 21e44d1..30b820c 100644 --- a/glx/glxdri.c +++ b/glx/glxdri.c @@ -968,6 +968,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) const __DRIconfig **driConfigs; const __DRIextension **extensions; int i; + int from = X_ERROR; if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || @@ -1047,7 +1048,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); if (screen->driver == NULL) { - LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", + if (!strcmp(driverName, "nouveau")) + from = X_INFO; + LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", filename, dlerror()); goto handle_error; } @@ -1184,7 +1187,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) xfree(screen); - LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); + LogMessage(from, "AIGLX: reverting to software rendering\n"); return NULL; } diff --git a/glx/glxdri2.c b/glx/glxdri2.c index 0f998de..a244809 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -676,6 +676,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) const __DRIextension **extensions; const __DRIconfig **driConfigs; int i; + int from = X_ERROR; screen = xcalloc(1, sizeof *screen); if (screen == NULL) @@ -702,7 +703,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); if (screen->driver == NULL) { - LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", + if (!strcmp(driverName, "nouveau")) + from = X_INFO; + LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", filename, dlerror()); goto handle_error; } @@ -793,7 +796,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) xfree(screen); - LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); + LogMessage(from, "AIGLX: reverting to software rendering\n"); return NULL; } ++++++ zap_warning_xserver.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c ================================================================================ ---- xorg-server-1.7.4/hw/xfree86/common/xf86Config.c -+++ xorg-server-1.7.4/hw/xfree86/common/xf86Config.c -@@ -679,6 +679,7 @@ +--- xorg-server-1.7.99/hw/xfree86/common/xf86Config.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86Config.c +@@ -696,6 +696,7 @@ FLAG_NOTRAPSIGNALS, FLAG_DONTVTSWITCH, FLAG_DONTZAP, @@ -10,7 +10,7 @@ FLAG_DONTZOOM, FLAG_DISABLEVIDMODE, FLAG_ALLOWNONLOCAL, -@@ -717,6 +718,8 @@ +@@ -734,6 +735,8 @@ {0}, FALSE }, { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, {0}, FALSE }, @@ -19,7 +19,7 @@ { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, {0}, FALSE }, { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, -@@ -823,6 +826,7 @@ +@@ -840,6 +843,7 @@ xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals); xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); @@ -27,8 +27,8 @@ xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI); ---- xorg-server-1.7.4/hw/xfree86/common/xf86Events.c -+++ xorg-server-1.7.4/hw/xfree86/common/xf86Events.c +--- xorg-server-1.7.99/hw/xfree86/common/xf86Events.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86Events.c @@ -180,12 +180,26 @@ DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg); switch (action) { @@ -60,8 +60,8 @@ break; case ACTION_NEXT_MODE: if (!xf86Info.dontZoom) ---- xorg-server-1.7.4/hw/xfree86/common/xf86Globals.c -+++ xorg-server-1.7.4/hw/xfree86/common/xf86Globals.c +--- xorg-server-1.7.99/hw/xfree86/common/xf86Globals.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86Globals.c @@ -109,6 +109,7 @@ #endif .dontVTSwitch = FALSE, @@ -70,8 +70,8 @@ .dontZoom = FALSE, .notrapSignals = FALSE, .caughtSignal = FALSE, ---- xorg-server-1.7.4/hw/xfree86/common/xf86Privstr.h -+++ xorg-server-1.7.4/hw/xfree86/common/xf86Privstr.h +--- xorg-server-1.7.99/hw/xfree86/common/xf86Privstr.h ++++ xorg-server-1.7.99/hw/xfree86/common/xf86Privstr.h @@ -67,6 +67,7 @@ #endif Bool dontVTSwitch; @@ -80,9 +80,9 @@ Bool dontZoom; Bool notrapSignals; /* don't exit cleanly - die at fault */ Bool caughtSignal; ---- xorg-server-1.7.4/hw/xfree86/doc/man/Xorg.man.pre -+++ xorg-server-1.7.4/hw/xfree86/doc/man/Xorg.man.pre -@@ -431,7 +431,7 @@ +--- xorg-server-1.7.99/hw/xfree86/doc/man/Xorg.man.pre ++++ xorg-server-1.7.99/hw/xfree86/doc/man/Xorg.man.pre +@@ -438,7 +438,7 @@ .B Ctrl+Alt+Backspace Immediately kills the server -- no questions asked. It can be disabled by setting the @@ -91,9 +91,9 @@ __xconfigfile__(__filemansuffix__) file option to a TRUE value. .TP 8 .B Ctrl+Alt+Keypad-Plus ---- xorg-server-1.7.4/hw/xfree86/doc/man/xorg.conf.man.pre -+++ xorg-server-1.7.4/hw/xfree86/doc/man/xorg.conf.man.pre -@@ -479,6 +479,13 @@ +--- xorg-server-1.7.99/hw/xfree86/doc/man/xorg.conf.man.pre ++++ xorg-server-1.7.99/hw/xfree86/doc/man/xorg.conf.man.pre +@@ -507,6 +507,13 @@ When this option is enabled, the action has no effect. Default: off. .TP 7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fwnn for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '10

26 Mar '10

Hello community, here is the log from the commit of package fwnn for openSUSE:Factory checked in at Fri Mar 26 01:19:38 CET 2010. -------- --- fwnn/fwnn.changes 2009-12-18 15:47:20.000000000 +0100 +++ fwnn/fwnn.changes 2010-03-15 17:45:26.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 15 17:35:59 CET 2010 - ro(a)suse.de + +- update to FreeWnn-1.1.1-a021 +- disable parallel building again (not solid) +- fix build by using "-traditional-cpp" for "gcc -E" + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- FreeWnn-1.1.1-a017.dif FreeWnn-1.1.1-a017.tar.bz2 FreeWnn-fixes.patch FreeWnn-lib64.patch conflicting-prototypes.patch New: ---- FreeWnn-1.1.1-a021.dif FreeWnn-1.1.1-a021.tar.bz2 FreeWnn-prototypes.patch FreeWnn-trad_cpp.patch fwnn-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwnn.spec ++++++ --- /var/tmp/diff_new_pack.1mnK0l/_old 2010-03-26 01:15:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1mnK0l/_new 2010-03-26 01:15:17.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package fwnn (Version 1.1.1a017) +# spec file for package fwnn (Version 1.1.1a021) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +21,15 @@ Name: fwnn BuildRequires: ncurses-devel termcap %define base_version 1.1.1 -%define alpha_version a017 +%define alpha_version a021 License: GPLv2+ Group: System/I18n/Japanese Requires: fwnncom Conflicts: wnn6 PreReq: /usr/sbin/useradd %insserv_prereq %fillup_prereq AutoReqProv: on -Version: 1.1.1a017 -Release: 680 +Version: 1.1.1a021 +Release: 1 Url: http://www.freewnn.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: FreeWnn Japanese Input System--Server Only @@ -38,19 +38,19 @@ Source2: rcfcwnn Source3: rcftwnn Source4: rcfkwnn +Source99: fwnn-rpmlintrc Patch0: FreeWnn-fsstnd.patch Patch1: FreeWnn-ja.patch Patch2: FreeWnn-noroot.patch Patch3: FreeWnn-sighandler.patch Patch4: FreeWnn-uum.patch Patch5: FreeWnn-%{base_version}-%{alpha_version}.dif -Patch6: FreeWnn-lib64.patch Patch7: FreeWnn-s390x.patch Patch8: FreeWnn-warnings.patch -Patch9: conflicting-prototypes.patch -Patch10: FreeWnn-fixes.patch Patch11: FreeWnn-include.patch Patch12: FreeWnn-returnvalue.diff +Patch13: FreeWnn-prototypes.patch +Patch14: FreeWnn-trad_cpp.patch # Summary(ja): FreeWnn 日本語入力システム - サーバのみ # %description -l ja # @@ -250,20 +250,19 @@ # 国語の入力環境を提供します。クライアントは、ＸＩＭライブラリを使うことに # より、xwnmo を使用できます。変換のエンジンには、国際化されたＷｎｎを使用 # します。クライアントのランゲージに応じて、変換サーバを選択します。 -%setup -q -n FreeWnn-%{base_version}-%{alpha_version}/Xsi +%setup -q -n FreeWnn-%{base_version}-%{alpha_version} %patch0 -p2 %patch1 -p2 %patch2 -p2 %patch3 -p2 %patch4 -p2 %patch5 -p1 -%patch6 -p2 %patch7 -p2 -b .s390x %patch8 -%patch9 -p2 -%patch10 -p2 %patch11 -p2 %patch12 +%patch13 +%patch14 #%setup -b 1 -n Xsi # add include-files for Xwnmo # SuSE setlocale patch, try to set LC_CTYPE if LC_ALL fails (Xwnmo) and #...................................................................... @@ -280,9 +279,10 @@ --mandir=%{_mandir} \ --infodir=%{_infodir} \ %{_target_cpu}-suse-linux-gnu -make %{?jobs:-j%jobs} CCOPTIONS="$RPM_OPT_FLAGS" +# not -j safe, see Wnn/pubdicplus/Makefile.in +make CCOPTIONS="$RPM_OPT_FLAGS" pushd Wnn/uum -make %{?jobs:-j%jobs} CCOPTIONS="$RPM_OPT_FLAGS" +make CCOPTIONS="$RPM_OPT_FLAGS" popd %install @@ -337,6 +337,7 @@ ln -sf /var/lib/wnn/zh_TW/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/zh_TW/dic ln -sf /var/lib/wnn/ko_KR/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/ko_KR/dic #---------------------------------------------------------------------- +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; @@ -466,13 +467,17 @@ %config /etc/FreeWnn/lt_LN/uumkey %config /etc/FreeWnn/lt_LN/uumkey_e %config /etc/FreeWnn/lt_LN/uumrc +%{_libdir}/libjd.so.0* +%{_libdir}/libwnn.so.0* %files -n fwnn-devel %defattr(-,root,root) %dir /usr/include/wnn/ /usr/include/wnn/* %{_libdir}/libjd.a +%{_libdir}/libjd.so %{_libdir}/libwnn.a +%{_libdir}/libwnn.so %files -n fwnncom %defattr(-,root,root) @@ -525,6 +530,7 @@ %config /etc/FreeWnn/zh_CN/wnnenvrc_Wu %config /etc/FreeWnn/zh_CN/wnnenvrc_WuR %config /etc/FreeWnn/zh_CN/wnnstat.msg +%{_libdir}/libcwnn.so.0* %files -n fcwnncom %defattr(-,root,root) @@ -542,6 +548,7 @@ %dir /usr/include/cwnn/ /usr/include/cwnn/* %{_libdir}/libcwnn.a +%{_libdir}/libcwnn.so %files -n ftwnn %defattr(-,root,root) @@ -600,12 +607,14 @@ %config /etc/FreeWnn/ko_KR/wnnenvrc %config /etc/FreeWnn/ko_KR/wnnenvrc_R %config /etc/FreeWnn/ko_KR/wnnstat.msg +%{_libdir}/libkwnn.so.0* %files -n fkwnndev %defattr(-,root,root) %dir /usr/include/kwnn/ /usr/include/kwnn/* %{_libdir}/libkwnn.a +%{_libdir}/libkwnn.so # I don't know how to build xwnmo. Will try that later ... # %files -n xwnmo # %doc Xwnmo/manual Xwnmo/manual.en Xwnmo/README Xwnmo/README.j ++++++ FreeWnn-1.1.1-a017.dif -> FreeWnn-1.1.1-a021.dif ++++++ --- fwnn/FreeWnn-1.1.1-a017.dif 2007-01-16 00:13:16.000000000 +0100 +++ fwnn/FreeWnn-1.1.1-a021.dif 2010-03-15 02:10:06.000000000 +0100 @@ -1,26 +1,6 @@ ---- Xsi/PubdicPlus/pod.c -+++ Xsi/PubdicPlus/pod.c 2001/09/04 16:59:45 -@@ -26,13 +26,15 @@ - - #include <stdio.h> - --#define bzero(a, c) memset(a, 0, c) -- - #if __STDC__ - #include <stddef.h> -+#include <stdlib.h> -+#include <string.h> - #else - extern char *malloc (); - #endif -+ -+#define bzero(a, c) memset(a, 0, c) - - #define POD_WCHAR - ---- Xsi/Wnn/include/jllib.h -+++ Xsi/Wnn/include/jllib.h 2001/09/04 18:55:55 -@@ -248,58 +248,58 @@ +--- FreeWnn-1.1.1-a021/Wnn/include/jllib.h ++++ FreeWnn-1.1.1-a021/Wnn/include/jllib.h +@@ -248,59 +248,59 @@ #define jl_set_lang(buf, lang) js_set_lang((buf)->env, lang) /* extern function defines */ @@ -127,19 +107,19 @@ -extern void jl_get_zenkouho_yomi (); +extern void jl_get_zenkouho_yomi (struct wnn_buf *, int, w_char *); #endif - #endif /* JLLIB */ ---- Xsi/Wnn/jlib/jl.c -+++ Xsi/Wnn/jlib/jl.c 2001/09/04 19:06:21 -@@ -38,6 +38,8 @@ - #include "commonhd.h" - #include "wnn_config.h" - #include <stdio.h> -+#include <stdlib.h> + + #endif /* WNN_JLLIB_H */ +--- FreeWnn-1.1.1-a021/Wnn/jlib/jl.c ++++ FreeWnn-1.1.1-a021/Wnn/jlib/jl.c +@@ -52,6 +52,7 @@ + # include <malloc.h> + # endif + #endif /* STDC_HEADERS */ +#include <stdarg.h> #include <sys/types.h> - #ifdef SYSVR2 - # include <string.h> -@@ -145,7 +147,7 @@ + #include <sys/file.h> + #include <sys/stat.h> +@@ -159,7 +160,7 @@ static void make_space_for (); static void make_space_for_bun (); static void make_space_for_zenkouho (); @@ -148,7 +128,7 @@ static int ren_conv1 (); static void set_dai (); static void set_sho (); -@@ -261,7 +263,7 @@ +@@ -275,7 +276,7 @@ static struct wnn_env * find_same_env (js, env_n, lang) register WNN_JSERVER_ID *js; @@ -157,7 +137,7 @@ char *lang; { register int k; -@@ -300,7 +302,7 @@ +@@ -314,7 +315,7 @@ add_new_env (js, env, env_n, server_n, lang) register WNN_JSERVER_ID *js; register struct wnn_env *env; @@ -166,7 +146,7 @@ { register int k; -@@ -421,15 +423,16 @@ +@@ -435,15 +436,16 @@ struct wnn_env * jl_connect_lang (env_n, server_n, lang, wnnrc_n, error_handler, message_handler, timeout) @@ -186,7 +166,7 @@ extern char *getenv (); extern char *_wnn_get_machine_of_serv_defs (); -@@ -562,8 +565,8 @@ +@@ -576,8 +578,8 @@ struct wnn_buf * jl_open_lang (env_n, server_n, lang, wnnrc_n, error_handler, message_handler, timeout) @@ -197,7 +177,7 @@ int timeout; { register int k, dmy; -@@ -1490,7 +1493,7 @@ +@@ -1504,7 +1506,7 @@ int prio; int rw, hrw, rev; char *pwd_dic, *pwd_hindo; @@ -206,7 +186,7 @@ { char tmp[256]; char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN]; -@@ -1505,7 +1508,7 @@ +@@ -1519,7 +1521,7 @@ jl_disconnect (env); return (-1); } @@ -215,7 +195,7 @@ { sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 200, NULL, env->lang), dic_name, msg_get (wnn_msg_cat, 201, NULL, env->lang)); /* -@@ -1519,7 +1522,7 @@ +@@ -1533,7 +1535,7 @@ /* "��ե�� \"%s\" ��̵��衣��?(Y/N)", */ @@ -224,7 +204,7 @@ { if (create_file (env, dic_name, JISHO, -1, /* -1 is dummy */ pwd_dic, (hindo_name && *hindo_name) ? "" : pwd_hindo, error_handler, message_handler) == -1) -@@ -1544,7 +1547,7 @@ +@@ -1558,7 +1560,7 @@ jl_disconnect (env); return (-1); } @@ -233,7 +213,7 @@ { sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 203, NULL, env->lang), hindo_name, msg_get (wnn_msg_cat, 201, NULL, env->lang)); /* -@@ -1558,7 +1561,7 @@ +@@ -1572,7 +1574,7 @@ /* "��٥ե�� \"%s\" ��̵��衣��?(Y/N)", */ @@ -242,7 +222,7 @@ { if (create_file (env, hindo_name, HINDO, fid, "", pwd_hindo, error_handler, message_handler) == -1) return (-1); -@@ -1587,7 +1590,7 @@ +@@ -1601,7 +1603,7 @@ } else if (wnn_errorno == WNN_HINDO_NO_MATCH) { @@ -251,7 +231,7 @@ { return (-1); } -@@ -1595,7 +1598,7 @@ +@@ -1609,7 +1611,7 @@ /* "�� \"%s\" ��̵��衣��ľ��?(Y/N)", */ @@ -260,7 +240,7 @@ { return (-1); } -@@ -1671,7 +1674,7 @@ +@@ -1685,7 +1687,7 @@ create_pwd_file (env, pwd_file, error_handler, message_handler) register struct wnn_env *env; char *pwd_file; @@ -269,7 +249,7 @@ { FILE *fp; char gomi[256]; -@@ -2731,17 +2734,17 @@ +@@ -2749,17 +2751,17 @@ int jl_set_env_wnnrc (env, wnnrc_n, error_handler, message_handler) register struct wnn_env *env; @@ -291,7 +271,7 @@ { confirm_state = NO_CREATE; } -@@ -2757,8 +2760,8 @@ +@@ -2775,8 +2777,8 @@ int jl_set_env_wnnrc1 (env, wnnrc_n, error_handler, message_handler, level) register struct wnn_env *env; @@ -302,7 +282,7 @@ int level; { register int num; -@@ -2811,7 +2814,7 @@ +@@ -2829,7 +2831,7 @@ { /* dic_add */ int prio, rdonly, hrdonly, rev; @@ -311,7 +291,7 @@ expand_expr_all (s[0], env); if (num < 3 || !REAL_PARAM (s[1])) { -@@ -2837,11 +2840,11 @@ +@@ -2855,11 +2857,11 @@ else if (confirm_state == CREATE_WITHOUT_CONFIRM) { @@ -325,7 +305,7 @@ } if (jl_dic_add_e (env, s[0], s[1], rev, prio, rdonly, hrdonly, s[5], s[6], error_handler1, message_handler) == -1 && wnn_errorno != 0) { -@@ -2972,7 +2975,7 @@ +@@ -2990,7 +2992,7 @@ if (*s != '~' && *s != '@') return (0); @@ -334,7 +314,7 @@ return (-1); s1 = s; -@@ -2995,12 +2998,12 @@ +@@ -3008,12 +3010,12 @@ { if (*s1) { @@ -349,7 +329,7 @@ } } -@@ -3008,13 +3011,13 @@ +@@ -3021,13 +3023,13 @@ { /* then, *s must be '@' */ if (!strcmp (s1, "HOME")) { @@ -365,7 +345,7 @@ strcpy (buf, p); strcat (buf, "/"); -@@ -3031,15 +3034,15 @@ +@@ -3044,15 +3046,15 @@ } else if (!strcmp (s1, "LIBDIR")) { @@ -384,7 +364,7 @@ } else { /* @HOME, @LIBDIR @ENV igai ha kaenai */ -@@ -3063,7 +3066,7 @@ +@@ -3076,7 +3078,7 @@ total = 0; flag = 0; @@ -393,7 +373,7 @@ { if (isdigit (*st)) { -@@ -3122,7 +3125,7 @@ +@@ -3135,7 +3137,7 @@ int d; int fid; char *pwd_dic, *pwd_hindo; @@ -402,7 +382,7 @@ { char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN]; int rev_dict_type; -@@ -3230,7 +3233,7 @@ +@@ -3243,7 +3245,7 @@ make_dir_rec1 (env, path, error_handler, message_handler) struct wnn_env *env; register char *path; @@ -411,7 +391,7 @@ { char gomi[128]; register char *c; -@@ -3253,7 +3256,7 @@ +@@ -3266,7 +3268,7 @@ make_dir1 (env, dirname, error_handler, message_handler) register struct wnn_env *env; register char *dirname; @@ -420,7 +400,7 @@ { char gomi[128]; if (dirname[0] == C_LOCAL) -@@ -3274,7 +3277,7 @@ +@@ -3287,7 +3289,7 @@ return (0); /* dir already exists */ } } @@ -429,7 +409,7 @@ { sprintf (gomi, "%s \"%s\" %s%s", msg_get (wnn_msg_cat, 210, NULL, env->lang), dirname, msg_get (wnn_msg_cat, 201, NULL, env->lang), msg_get (wnn_msg_cat, 202, NULL, env->lang)); /* -@@ -3311,8 +3314,8 @@ +@@ -3324,8 +3326,8 @@ static int call_error_handler (error_handler, c) @@ -440,7 +420,7 @@ { register int x; x = error_handler (c); -@@ -3327,16 +3330,16 @@ +@@ -3340,16 +3342,16 @@ } static void @@ -462,9 +442,9 @@ (*message_handler) (buf); } } ---- Xsi/Wnn/jlib/js.c -+++ Xsi/Wnn/jlib/js.c 2001/09/04 17:34:48 -@@ -900,7 +900,7 @@ +--- FreeWnn-1.1.1-a021/Wnn/jlib/js.c ++++ FreeWnn-1.1.1-a021/Wnn/jlib/js.c +@@ -979,7 +979,7 @@ free((char *)env); */ set_current_js (env->js_id); @@ -473,75 +453,3 @@ snd_env_head (&tmp_env, JS_DISCONNECT); snd_flush (); x = get4com (); ---- Xsi/Wnn/jutil/atod.c -+++ Xsi/Wnn/jutil/atod.c 2001/09/04 16:59:45 -@@ -39,6 +39,8 @@ - - #include <stdio.h> - #include <ctype.h> -+#include <string.h> -+#include <stdlib.h> - #include "commonhd.h" - #include "wnn_config.h" - #include "jslib.h" ---- Xsi/Wnn/jutil/atorev.c -+++ Xsi/Wnn/jutil/atorev.c 2001/09/04 16:59:45 -@@ -35,6 +35,7 @@ - - #include <stdio.h> - #include <ctype.h> -+#include <stdlib.h> - #include "commonhd.h" - #include "jslib.h" - #include "jh.h" ---- Xsi/Wnn/jutil/dtoa.c -+++ Xsi/Wnn/jutil/dtoa.c 2001/09/04 16:59:45 -@@ -38,6 +38,8 @@ - #endif /* lint */ - - #include <stdio.h> -+#include <string.h> -+#include <stdlib.h> - #include "commonhd.h" - #include "wnn_config.h" - #include "jslib.h" ---- Xsi/Wnn/jutil/wddel.c -+++ Xsi/Wnn/jutil/wddel.c 2001/09/04 16:59:45 -@@ -38,6 +38,7 @@ - #endif /* lint */ - - #include <stdio.h> -+#include <stdlib.h> - #include "commonhd.h" - #include "wnn_config.h" - #include "jllib.h" ---- Xsi/Wnn/jutil/wdreg.c -+++ Xsi/Wnn/jutil/wdreg.c 2001/09/04 16:59:45 -@@ -38,6 +38,7 @@ - #endif /* lint */ - - #include <stdio.h> -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/file.h> - #include "commonhd.h" ---- Xsi/Wnn/uum/history.c -+++ Xsi/Wnn/uum/history.c 2001/09/04 16:59:45 -@@ -30,6 +30,7 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> - #include "commonhd.h" - #include "sdefine.h" - #include "sheader.h" ---- Xsi/Wnn/uum/sheader.h -+++ Xsi/Wnn/uum/sheader.h 2001/09/04 16:59:45 -@@ -320,6 +320,7 @@ - extern void set_keypad_on (); - extern void set_keypad_off (); - extern void set_scroll_region (); -+#define setenv fwnn_setenv - extern void setenv (); - extern int setutmp (); - extern int st_colum (); ++++++ FreeWnn-1.1.1-a017.tar.bz2 -> FreeWnn-1.1.1-a021.tar.bz2 ++++++ ++++ 1009484 lines of diff (skipped) ++++++ FreeWnn-include.patch ++++++ --- /var/tmp/diff_new_pack.1mnK0l/_old 2010-03-26 01:15:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1mnK0l/_new 2010-03-26 01:15:19.000000000 +0100 @@ -1,7 +1,6 @@ -diff -pur FreeWnn-1.1.1-a017-547/Xsi/PubdicPlus/ctopd.c FreeWnn-1.1.1-a017/Xsi/PubdicPlus/ctopd.c ---- FreeWnn-1.1.1-a017-547/Xsi/PubdicPlus/ctopd.c 2000-02-23 16:32:03.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/PubdicPlus/ctopd.c 2005-09-22 14:14:02.000000000 +0200 -@@ -25,6 +25,7 @@ static char rcsid[] = "$Id: ctopd.c,v 1. +--- BUILD/FreeWnn-1.1.1-a021/PubdicPlus/ctopd.c ++++ BUILD/FreeWnn-1.1.1-a021/PubdicPlus/ctopd.c +@@ -25,6 +25,7 @@ #endif #include <stdio.h> @@ -9,10 +8,9 @@ static char *program; -diff -pur FreeWnn-1.1.1-a017-547/Xsi/PubdicPlus/wtopd.c FreeWnn-1.1.1-a017/Xsi/PubdicPlus/wtopd.c ---- FreeWnn-1.1.1-a017-547/Xsi/PubdicPlus/wtopd.c 2000-02-23 16:32:03.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/PubdicPlus/wtopd.c 2005-09-22 14:12:49.000000000 +0200 -@@ -25,6 +25,8 @@ static char rcsid[] = "$Id: wtopd.c,v 1. +--- BUILD/FreeWnn-1.1.1-a021/PubdicPlus/wtopd.c ++++ BUILD/FreeWnn-1.1.1-a021/PubdicPlus/wtopd.c +@@ -25,6 +25,8 @@ #endif #include <stdio.h> @@ -21,15 +19,53 @@ static char *program; -diff -pur FreeWnn-1.1.1-a017-547/Xsi/Wnn/uum/ttyfdslot.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/ttyfdslot.c ---- FreeWnn-1.1.1-a017-547/Xsi/Wnn/uum/ttyfdslot.c 2000-02-23 16:31:45.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/ttyfdslot.c 2005-09-22 14:22:49.000000000 +0200 -@@ -37,6 +37,8 @@ - #if defined(BSD42) && (! defined(BSD43)) || defined(linux) +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/basic_op.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/basic_op.c +@@ -48,6 +48,7 @@ + # include <malloc.h> + # endif + #endif /* STDC_HEADERS */ ++#include <string.h> + #include "jllib.h" + #include "commonhd.h" + #include "sdefine.h" +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/hinsi.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/hinsi.c +@@ -30,6 +30,7 @@ + */ #include <stdio.h> +#include <string.h> -+#include <unistd.h> - #define SLOTSIZ 32 + #include "commonhd.h" + #include "sdefine.h" + #include "sheader.h" +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/jikouho.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/jikouho.c +@@ -30,6 +30,7 @@ + */ + + #include <stdio.h> ++#include <string.h> + #include "jllib.h" + #include "commonhd.h" + #include "sdefine.h" +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/printf.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/printf.c +@@ -30,6 +30,7 @@ + */ - char *ttyname (); + #include <stdio.h> ++#include <string.h> + #include "commonhd.h" + #include "sdefine.h" + #include "sheader.h" +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/touroku.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/touroku.c +@@ -32,6 +32,7 @@ + /* ��Ͽ�Τ��Υ롼�� */ + + #include <stdio.h> ++#include <string.h> + #include "jllib.h" + #include "commonhd.h" + #include "sdefine.h" ++++++ FreeWnn-noroot.patch ++++++ --- /var/tmp/diff_new_pack.1mnK0l/_old 2010-03-26 01:15:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1mnK0l/_new 2010-03-26 01:15:19.000000000 +0100 @@ -1,50 +1,50 @@ ---- FreeWnn-1.1.1-a017/Xsi/Contrib/dic/gerodic/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Contrib/dic/gerodic/Makefile.in -@@ -62,9 +62,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/Contrib/dic/gerodic/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Contrib/dic/gerodic/Makefile.in +@@ -67,9 +67,7 @@ install:: ${OBJ} @if [ -d $(DESTDIR)$(GERODIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(GERODIR)); fi - chown ${WNNOWNER} $(DESTDIR)$(GERODIR) -- @INSTALL@ $(INSTALLFLAGS) $(INSTDATFLAGS) -o ${WNNOWNER} ${OBJ} $(DESTDIR)$(GERODIR) +- $(INSTALL) $(INSTDATFLAGS) $(LOCAL_INSTFLAGS) ${OBJ} $(DESTDIR)$(GERODIR) - ${WNNTOUCH} $(DESTDIR)$(GERODIR)/${OBJ} -+ @INSTALL@ $(INSTALLFLAGS) $(INSTDATFLAGS) ${OBJ} $(DESTDIR)$(GERODIR) ++ $(INSTALL) $(INSTDATFLAGS) ${OBJ} $(DESTDIR)$(GERODIR) clean:: $(RM) ${OBJ} ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/Makefile.in +--- BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/Makefile.in @@ -36,7 +36,7 @@ - JSERVERDEFINES = -DJSERVER -DWRITE_CHECK - INCLUDES = -I$(WNNINCLUDESRC) -I$(TOP) - DEFINES = $(WNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) --LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(WNNOWNER) + top_builddir = @top_builddir@ + + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) +LOCAL_INSTFLAGS = - SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(JWNNLANG)/jserverrc\" - HINSIDEFINES = -DHINSIDATA_FILE=\"/$(JWNNLANG)/hinsi.data\" ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/Makefile.in -@@ -35,7 +35,7 @@ + JSERVERDEFINES = -DJSERVER -DWRITE_CHECK + INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) -I$(srcdir) +--- BUILD/FreeWnn-1.1.1-a021/Wnn/jutil/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/jutil/Makefile.in +@@ -37,7 +37,7 @@ + INSTALL = @INSTALL@ $(INSTALLFLAGS) + LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + LT_LD = $(LIBTOOL) --mode=link $(CCLINK) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = - INCLUDES = -I$(WNNINCLUDESRC) + INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) DEFINES = $(WNNDEFINES) $(WNNLANGDEF) -- INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) -o $(WNNOWNER) -+ INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) - HINSIDEFINE = -DHINSIDATA_FILE=\"/$(JWNNLANG)/hinsi.data\" - - CLIENTPROGRAMS = wnnstat wnnkill wddel wdreg ---- FreeWnn-1.1.1-a017/Xsi/Wnn/pubdicplus/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/pubdicplus/Makefile.in -@@ -33,7 +33,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in +@@ -35,7 +35,7 @@ + WNNJUTILOBJ = $(top_builddir)/Wnn/jutil - INSTALL = @INSTALL@ + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = -- INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) -+ INSTALLFLAGS = $(INSTLIBFLAGS) - ATOD = $(WNNJUTILSRC)/atod - ATOF = $(WNNJUTILSRC)/atof - WNNTOUCH = $(WNNJUTILSRC)/wnntouch -@@ -371,8 +371,7 @@ + INCLUDES = -I$(top_builddir) + ATOD = $(WNNJUTILOBJ)/atod +@@ -377,8 +377,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(JWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -54,71 +54,71 @@ done install:: $(DIC) ---- FreeWnn-1.1.1-a017/Xsi/Wnn/uum/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/Makefile.in -@@ -36,7 +36,7 @@ - UUMOWNER = root - INCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANSRC) - DEFINES = $(SIGNAL_DEFINES) $(WNNDEFINES) $(WNNLANGDEF) +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/Makefile.in +@@ -35,7 +35,7 @@ + VPATH = @srcdir@ + + INSTALL = @INSTALL@ $(INSTALLFLAGS) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) +LOCAL_INSTFLAGS = - LOCAL_LIBRARIES = $(WNNJLIB) $(WNNCONVLIB) - SRC1= epilogue.c header.c kensaku.c kuten.c jis_in.c prologue.c touroku.c jikouho.c jutil.c w_string.c printf.c termio.c hinsi.c termcap.c ttyfdslot.c setutmp.c redraw.c history.c key_bind.c screen.c basic_op.c uif.c cursor.c jhlp.c select_ele.c inspect.c wnnrc_op.c functions.c ---- FreeWnn-1.1.1-a017/Xsi/Wnn/wnncons/dic/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/wnncons/dic/Makefile.in + UUMOWNER = root + INCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANSRC) -I$(top_builddir) +--- BUILD/FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in @@ -33,7 +33,7 @@ + top_builddir = ../../.. - INSTALL = @INSTALL@ + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = -- INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) -+ INSTALLFLAGS = $(INSTLIBFLAGS) ATOD = $(WNNJUTILSRC)/atod WNNTOUCH = $(WNNJUTILSRC)/wnntouch - HINSI = $(WNNJDSRC)/hinsi.data ---- FreeWnn-1.1.1-a017/Xsi/Xwnmo/xjutil/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Xwnmo/xjutil/Makefile.in -@@ -22,7 +22,7 @@ +@@ -86,7 +86,7 @@ + set +x; \ + else (set -x; \ + $(INSTALL) $(INSTDATFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNWNNCONSDICDIR); \ +- $(WNNTOUCH) $(DESTDIR)$(JWNNWNNCONSDICDIR)/$$i); fi \ ++ ); fi \ + done - include @top_srcdir@/makerule.mk + depend:: +--- BUILD/FreeWnn-1.1.1-a021/Xwnmo/xjutil/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Xwnmo/xjutil/Makefile.in +@@ -26,7 +26,7 @@ + top_builddir = ../.. + + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = --LOCAL_INSTFLAGS = $(INSTBINFLAGS) -o $(WNNOWNER) -+LOCAL_INSTFLAGS = INCLUDES = -I. $(XWNMOINCLUDES) -I$(XWNMOSRC) - DEPLIBS = $(XWNMOJLIB) ---- FreeWnn-1.1.1-a017/Xsi/Xwnmo/xwnmo/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Xwnmo/xwnmo/Makefile.in -@@ -22,7 +22,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/Makefile.in +@@ -26,7 +26,7 @@ + top_builddir = ../.. - include @top_srcdir@/makerule.mk + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = --LOCAL_INSTFLAGS = $(INSTBINFLAGS) -o $(WNNOWNER) -+LOCAL_INSTFLAGS = INCLUDES = $(XWNMOINCLUDES) - DEPLIBS = $(XWNMOJLIB) ---- FreeWnn-1.1.1-a017/Xsi/cWnn/cdic/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/cdic/Makefile.in -@@ -25,7 +25,7 @@ - include @top_srcdir@/makerule.mk +--- BUILD/FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in +@@ -31,7 +31,7 @@ + CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil - INSTALL = @INSTALL@ --INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) -+INSTALLFLAGS = $(INSTLIBFLAGS) + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = - ATOD = $(CWNNJUTILSRC)/catod - ATOF = $(CWNNJUTILSRC)/catof -@@ -34,7 +34,7 @@ - # HINSI = ./cixing.data - FZK_FLAG = - -- INSTALLFLAGS = -m 644 -o $(WNNOWNER) -+ INSTALLFLAGS = -m 644 - - FULL = full.con - FULLR = full.conR -@@ -69,8 +69,7 @@ + ATOD = $(CWNNJUTILOBJ)/catod + ATOF = $(CWNNJUTILOBJ)/catof +@@ -85,8 +85,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(CWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -128,49 +128,40 @@ done install:: $(ALLTGT) ---- FreeWnn-1.1.1-a017/Xsi/cWnn/jserver/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/jserver/Makefile.in -@@ -36,7 +36,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/cWnn/jserver/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/cWnn/jserver/Makefile.in +@@ -38,7 +38,7 @@ JSERVERDEFINES = -DJSERVER -DWRITE_CHECK - INCLUDES = -I$(CWNNINCLUDESRC) -I$(TOP) + INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) DEFINES = $(CWNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) $(CWNNLANGDEF) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(WNNOWNER) +LOCAL_INSTFLAGS = SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(CWNNLANG)/cserverrc\" HINSIDEFINE = -DHINSIDATA_FILE=\"/$(CWNNLANG)/cixing.data\" TSERVERINITDEF = -DSERVER_INIT_FILE=\"/$(TWNNLANG)/tserverrc\" ---- FreeWnn-1.1.1-a017/Xsi/cWnn/jutil/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/jutil/Makefile.in -@@ -32,7 +32,7 @@ - include @top_srcdir@/makerule.mk - - INSTALL = @INSTALL@ --INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) -o $(WNNOWNER) -+INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) +--- BUILD/FreeWnn-1.1.1-a021/cWnn/jutil/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/cWnn/jutil/Makefile.in +@@ -36,7 +36,7 @@ + INSTALL = @INSTALL@ $(INSTALLFLAGS) + LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + LT_LD = $(LIBTOOL) --mode=link $(CCLINK) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = - INCLUDES = -I$(CWNNINCLUDESRC) + INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) ---- FreeWnn-1.1.1-a017/Xsi/cWnn/tdic/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/tdic/Makefile.in -@@ -25,7 +25,7 @@ - include @top_srcdir@/makerule.mk +--- BUILD/FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in +@@ -31,7 +31,7 @@ + CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil INSTALL = @INSTALL@ --INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) -+INSTALLFLAGS = $(INSTLIBFLAGS) +-INSTALLFLAGS = -o $(WNNOWNER) ++INSTALLFLAGS = - ATOD = $(CWNNJUTILSRC)/catod - ATOF = $(CWNNJUTILSRC)/catof -@@ -34,7 +34,7 @@ - # HINSI = ./cixing.data - FZK_FLAG = - -- INSTALLFLAGS = -m 644 -o $(WNNOWNER) -+ INSTALLFLAGS = -m 644 - - FULL = full.con - FULLR = full.conR -@@ -69,8 +69,7 @@ + ATOD = $(CWNNJUTILOBJ)/catod + ATOF = $(CWNNJUTILOBJ)/catof +@@ -85,8 +85,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(TWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -180,59 +171,51 @@ done install:: $(ALLTGT) ---- FreeWnn-1.1.1-a017/Xsi/cWnn/uum/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/uum/Makefile.in -@@ -36,7 +36,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/cWnn/uum/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/cWnn/uum/Makefile.in +@@ -37,7 +37,7 @@ UUMOWNER = root - INCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANSRC) + INCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANSRC) -I$(top_builddir) DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) -+LOCAL_INSTFLAGS = - LOCAL_LIBRARIES = $(CWNNJLIB) $(CWNNCONVLIB) ++LOCAL_INSTFLAGS = + LOCAL_LIBRARIES = $(CWNNJLIB) $(CWNNCONVLIB) @LIBS@ HDRS= buffer.h cvtcode.h sdefine.h sheader.h ---- FreeWnn-1.1.1-a017/Xsi/kWnn/jserver/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/kWnn/jserver/Makefile.in -@@ -36,7 +36,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in +@@ -38,7 +38,7 @@ JSERVERDEFINES = -DJSERVER -DWRITE_CHECK - INCLUDES = -I$(KWNNJSERVERSRC) -I$(KWNNINCLUDESRC) -I$(TOP) + INCLUDES = -I$(KWNNJSERVERSRC) -I$(KWNNINCLUDESRC) -I$(top_builddir) DEFINES = $(KWNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) $(KWNNLANGDEF) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(WNNOWNER) +LOCAL_INSTFLAGS = SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(KWNNLANG)/kserverrc\" HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\" + WRAPLIB = @WRAPLIB@ +--- BUILD/FreeWnn-1.1.1-a021/kWnn/jutil/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/kWnn/jutil/Makefile.in +@@ -39,7 +39,7 @@ ---- FreeWnn-1.1.1-a017/Xsi/kWnn/jutil/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/kWnn/jutil/Makefile.in -@@ -35,7 +35,7 @@ - - INCLUDES = -I$(KWNNINCLUDESRC) + INCLUDES = -I$(KWNNINCLUDESRC) -I$(top_builddir) DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) -- INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) -o $(WNNOWNER) -+ INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\" CLIENTPROGRAMS = kwnnstat kwnnkill kwddel kwdreg ---- FreeWnn-1.1.1-a017/Xsi/kWnn/kdic/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/kWnn/kdic/Makefile.in -@@ -25,14 +25,14 @@ - include @top_srcdir@/makerule.mk +--- BUILD/FreeWnn-1.1.1-a021/kWnn/kdic/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/kWnn/kdic/Makefile.in +@@ -31,7 +31,7 @@ + KWNNJUTILOBJ = $(top_builddir)/kWnn/jutil INSTALL = @INSTALL@ --INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) -+INSTALLFLAGS = $(INSTLIBFLAGS) - ATOD = $(KWNNJUTILSRC)/katod - ATOF = $(KWNNJUTILSRC)/katof - WNNTOUCH = $(KWNNJUTILSRC)/kwnntouch - HINSI = $(KWNNKDSRC)/hinsi.data - FZK_FLAG = - -- INSTALLFLAGS = -m 644 -o $(WNNOWNER) -+ INSTALLFLAGS = -m 644 +-INSTALLFLAGS = -o $(WNNOWNER) ++INSTALLFLAGS = - FULL = full.fzk - -@@ -63,8 +63,7 @@ + ATOD = $(KWNNJUTILOBJ)/katod + ATOF = $(KWNNJUTILOBJ)/katof +@@ -76,8 +76,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(KWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -242,14 +225,14 @@ done install:: $(ALLTGT) ---- FreeWnn-1.1.1-a017/Xsi/kWnn/uum/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/kWnn/uum/Makefile.in -@@ -36,7 +36,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/kWnn/uum/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/kWnn/uum/Makefile.in +@@ -37,7 +37,7 @@ UUMOWNER = root - INCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANSRC) + INCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANSRC) -I$(top_builddir) DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) +LOCAL_INSTFLAGS = - LOCAL_LIBRARIES = $(KWNNJLIB) $(KWNNCONVLIB) + LOCAL_LIBRARIES = $(KWNNJLIB) $(KWNNCONVLIB) @LIBS@ HDRS= buffer.h cvtcode.h sdefine.h sheader.h ++++++ FreeWnn-prototypes.patch ++++++ --- Wnn/etc/pwd.c +++ Wnn/etc/pwd.c @@ -61,6 +61,7 @@ JS_STATIC void new_pwd (char* src, char* encd); JS_STATIC int check_pwd (char* src, char* encd); +extern char* crypt (const char *,const char *); JS_STATIC void new_pwd (char* src, char* encd) { --- Wnn/include/wnn_string.h +++ Wnn/include/wnn_string.h @@ -33,26 +33,26 @@ #ifndef WNN_STRING_H #define WNN_STRING_H -extern int wnn_sStrcpy (); -extern int wnn_Sstrcpy (); -extern void wnn_Sreverse (); -extern char *wnn_Stos (); -extern char *wnn_sStrncpy (); -extern w_char *wnn_Strcat (); -extern w_char *wnn_Strncat (); -extern int wnn_Strcmp (); -extern int wnn_Substr (); -extern int wnn_Strncmp (); -extern w_char *wnn_Strncpy (); -extern int wnn_Strlen (); -extern w_char *wnn_Strcpy (); -extern void wnn_delete_w_ss2 (); -extern int wnn_byte_count (); +extern int wnn_sStrcpy (register char*,register w_char*); +extern int wnn_Sstrcpy (w_char*,unsigned char*); +extern void wnn_Sreverse (w_char*,w_char*); +extern char *wnn_Stos (w_char*); +extern char *wnn_sStrncpy (register char*,register w_char*,int); +extern w_char *wnn_Strcat (register w_char*,register w_char*); +extern w_char *wnn_Strncat (register w_char*,register w_char*,int); +extern int wnn_Strcmp (register w_char*,register w_char*); +extern int wnn_Substr (register w_char*,register w_char*); +extern int wnn_Strncmp (register w_char*,register w_char*,int); +extern w_char *wnn_Strncpy (register w_char*,register w_char*,int); +extern int wnn_Strlen (register w_char*); +extern w_char *wnn_Strcpy (register w_char*,register w_char*); +extern void wnn_delete_w_ss2 (register w_char*,int); +extern int wnn_byte_count (register int); #ifndef JS -extern int check_pwd (); +extern int check_pwd (char*,char*); #endif #ifdef CHINESE -extern int wnn_Sstrcat (); +extern int wnn_Sstrcat (w_char*,unsigned char*); #endif #endif /* WNN_STRING_H */ --- Wnn/jutil/atod.c +++ Wnn/jutil/atod.c @@ -57,6 +57,7 @@ #if HAVE_UNISTD_H # include <unistd.h> #endif +#include <stdlib.h> #include "commonhd.h" #include "wnn_config.h" @@ -70,19 +71,24 @@ #include "wnn_string.h" #include "wnn_os.h" -extern int wnn_loadhinsi (), init_heap (), little_endian (), Sorted (), asshuku (), revdic (); -extern void ujis_header (), read_ujis (), reverse_yomi (), create_rev_dict (), -uniq_je (), sort_if_not_sorted (), output_header (), udytoS (), output_ri (), exit1 (), new_pwd (), rev_short_fun (), rev_w_char (); +extern int wnn_loadhinsi (unsigned char*), init_heap (int,int,int,int,FILE*), little_endian (), Sorted (register char*,register int,int,int (*sort_fun)(char*,char*)), asshuku (int), revdic (struct JT *,int); +#ifdef CHINESE +extern void ujis_header (int*); +#else +extern void ujis_header (void); +#endif +extern void read_ujis (int,int,int), reverse_yomi (void), create_rev_dict (void), +uniq_je (int(*func)(char*,char*)), sort_if_not_sorted (void), output_header (FILE*,struct JT*,struct wnn_file_head*), udytoS (w_char*,int,char*,struct uind1*), output_ri (FILE*), exit1 (void), new_pwd (char*,char*), rev_short_fun (w_char*), rev_w_char (w_char*,int); extern #ifdef BDIC_WRITE_CHECK int #else void #endif - put_n_EU_str (); -static void ujistoud (), output_dic_index (), usage (), sdic_sort (), -ujistosd (), not_enough_area (), get_pwd (), output_hindo (), output_hinsi (), output_kanji (), rev_dic_data (), set_pter1 (), output_comment (), output_hinsi_list (); -void upd_kanjicount (), output_dic_data (); + put_n_EU_str (FILE*,w_char*,int); +static void ujistoud (void), output_dic_index (void), usage (void), sdic_sort (void), +ujistosd (int,int), not_enough_area (void), get_pwd (char*,char*), output_hindo (FILE*), output_hinsi (FILE*), output_kanji (FILE*), rev_dic_data (void), set_pter1 (void), output_comment (FILE*), output_hinsi_list (FILE*); +void upd_kanjicount (int), output_dic_data (void); /* Switcher variable between UD and SD */ @@ -115,7 +121,7 @@ int tnum = 0; struct uind2 *uhopter; -char *hinsi_file_name = NULL; +unsigned char *hinsi_file_name = NULL; void @@ -221,16 +227,16 @@ } } -extern int sort_func_sdic (); -extern int sort_func_je (); +extern int sort_func_sdic (char*,char*); +extern int sort_func_je (char*,char*); FILE *ofpter; int main (int argc, char** argv) { char *cswidth_name; - extern char *get_cswidth_name (); - extern void set_cswidth (); + extern char *get_cswidth_name (register char*); + extern void set_cswidth (register unsigned int); com_name = argv[0]; init (argc, argv); @@ -301,7 +307,6 @@ exit (0); } - w_char * addyomient (int tn, w_char* yomi) { @@ -442,7 +447,7 @@ { if (which_dict == WNN_UD_DICT) { - fprintf (stderr, " tnum = %d\n ind2= %d\n kanji = %d\n", tnum, (char *) uhopter - (char *) hostart, kanjicount); + fprintf (stderr, " tnum = %d\n ind2= %d\n kanji = %d\n", tnum, (int)((char *) uhopter - (char *) hostart), kanjicount); jt.maxtable = tnum; jt.maxhontai = (char *) uhopter - (char *) hostart; jt.maxri2 = jt.maxri1[D_YOMI] = jt.maxri1[D_KANJI] = 0; @@ -470,7 +475,7 @@ } else { - fprintf (stderr, "node_count = %d ind= %d\n kanji = %d\n", node_count, (char *) hopter - (char *) hostart, kanjicount); + fprintf (stderr, "node_count = %d ind= %d\n kanji = %d\n", node_count, (int)((char *) hopter - (char *) hostart), kanjicount); jt.maxtable = 0; jt.maxhontai = (char *) hopter - (char *) hostart; jt.maxri2 = jt.maxri1[D_YOMI] = jt.maxri1[D_KANJI] = 0; --- Wnn/romkan/rk_bltinfn.c +++ Wnn/romkan/rk_bltinfn.c @@ -371,7 +371,7 @@ to_digit (in, base, outp) letter in, base, **outp; { - letter c, vtol (); + letter c, vtol (letter); if (c = in, c /= base) to_digit (c, base, outp); --- Wnn/romkan/rk_fundecl.h +++ Wnn/romkan/rk_fundecl.h @@ -39,12 +39,12 @@ ***********************************************************************/ /* Version 3.0 */ -extern letter *ltrncpy (); -extern int ltrcmp (), ltrncmp (); +extern letter *ltrncpy (letter*,letter*,int); +extern int ltrcmp (letter*,letter*), ltrncmp (letter*,letter*,int); -extern int romkan_init (), romkan_init2 (), romkan_init3 (); -extern letter romkan_getc (), *romkan_henkan (), romkan_next (); -extern letter romkan_ungetc (), romkan_unnext (); -extern void romkan_clear (); -extern char *romkan_dispmode (); +extern int romkan_init (char*,letter,char,letter(*keyinfn)(),int(*bytcntfn)()), romkan_init2 (char*,letter,char,letter(*keyinfn)(),int(*bytcntfn)(),char,char,char), romkan_init3 (char*,letter,letter,letter,letter(*keyinfn)(),int(*bytcntfn)(),int(*kbytcntfn)(),char,int); +extern letter romkan_getc (void), *romkan_henkan (letter), romkan_next (void); +extern letter romkan_ungetc (letter), romkan_unnext (letter); +extern void romkan_clear (void); +extern char *romkan_dispmode (void); extern char rk_errstat; /* ��ϴؿ��ǤϤʤ��ѿ� */ --- Wnn/romkan/rk_main.c +++ Wnn/romkan/rk_main.c @@ -91,23 +91,23 @@ letter saishu_out[OUTSIZ]; letter delchr, delchr2 = EOLTTR, nisedl; /* DEL�Υ��饯��Ĥޤǻ��Ƥ� */ -modetyp chgmod (), incmod (), decmod (); +modetyp chgmod (int,modetyp), incmod (int,modetyp), decmod (int,modetyp); /* letter��֤��ؿ��ڤ��ʰ��ˤ�char�Τ�Τ⺮��äƤ�� */ -static letter mchedsrc (); -letter romkan_next (), romkan_unnext (); -letter romkan_getc (), romkan_ungetc (), *romkan_henkan (); -letter to_zenalpha (), to_zenhira (), to_zenkata (); +static letter mchedsrc (int); +letter romkan_next (void), romkan_unnext (letter); +letter romkan_getc (void), romkan_ungetc (letter), *romkan_henkan (letter); +letter to_zenalpha (letter), to_zenhira (letter), to_zenkata (letter); /* to_zenhira;kata ��ʸ��ޤȤ�ˤ��ʤ�� */ -void BUGreport (); -static void maeato_henkan (), add_at_eof (), rk_delete (), set_rubout (), mchevl (), codeout_chg (), ltrevlcpy (); -int match (); -static int p_eq (), hen_ikisrc (), henkan_ok (), rk_rst (), head_bytecount (); -extern void readdata (), romkan_reset (), hank_setup (), to_hankata (), to_digit (), dakuadd (), handakuadd (), allchgmod (); -extern int ltov (); +void BUGreport (int); +static void maeato_henkan (letter,letter*,int*), add_at_eof (void), rk_delete (letter), set_rubout (letter*,int,letter), mchevl (letter**,letter*), codeout_chg (void), ltrevlcpy (letter*,letter*); +int match (void); +static int p_eq (register letter**,register letter**), hen_ikisrc (int,letter), henkan_ok (void), rk_rst (void), head_bytecount (uns_chr*); +extern void readdata (letter*,struct dat*,letter**,char*), romkan_reset (void), hank_setup (void), to_hankata (letter,letter**), to_digit (letter,letter,letter**), dakuadd (letter,letter**), handakuadd (letter,letter**), allchgmod (modetyp); +extern int ltov (letter); static letter * ltrcpy (lp1, lp2) @@ -426,6 +426,7 @@ lastoutlen = lastkbflen = 0; } +int romkan_init2 (char*,letter,char,letter(*keyinfn)(),int(*bytcntfn)(),char,char,char); /** ɽ��ɤ߹��Ѵ��ν��򤹤롣��part 1��*/ int romkan_init (modhyo, delchr_, chmoutf, keyinfn, bytcntfn) @@ -439,6 +440,7 @@ #define ifflg(a, b) ((a) ? (b) : 0) +int romkan_init3 (char*,letter,letter,letter,letter(*keyinfn)(),int(*bytcntfn)(),int(*kbytcntfn)(),char,int); /** ɽ��ɤ߹��Ѵ��ν��򤹤롣��part 2: ��Ϥ��Ф�ɬ�� ֤��褦�ˤ��뤫��Хåե��򥯥ꥢ��뤫�ɤ��ʤɤ��ġ�*/ int --- Wnn/romkan/rk_modread.c +++ Wnn/romkan/rk_modread.c @@ -63,17 +63,17 @@ #define Terminator 0 /* int��naibu[]�ˤν��ߥ�� */ -extern char *chrcat (), *strend (), *ename (); +extern char *chrcat (char*,char), *strend (char*), *ename (char*); extern void romkan_clear (); char *modhyopath; -static void cond_evl (), mystrcpy (), rd_bcksla (), rd_ctrl (), hyouse (), look_choose (); +static void cond_evl (char*), mystrcpy (char*,char*), rd_bcksla (register FILE*,char**), rd_ctrl (register FILE*,char**), hyouse (int), look_choose (int**,int); void choosehyo (); -static int mystrcmp (), read1tm (), mod_evl (), fnmsrc_tourk (), dspnamsrc_tourk (), -scan1tm (), modsrc_tourk (), chk_get_int (), pathsrc_tourk (), modnamchk (), ctov (), look_cond (), evlcond (), chkchar_getc (); -static char codeeval (); -extern void ERRMOD (), ERMOPN (), BUGreport (); -extern int filnamchk (); +static int mystrcmp (char*,char*), read1tm (char**,int), mod_evl (char*), fnmsrc_tourk (char*), dspnamsrc_tourk (char*), +scan1tm (char**,char*,int), modsrc_tourk (char*,int), chk_get_int (char*,unsigned int*,modetyp), pathsrc_tourk (char*), modnamchk (char*), ctov (char), look_cond (int**,int), evlcond (int**), chkchar_getc (FILE*); +static char codeeval (register char**); +extern void ERRMOD (unsigned int), ERMOPN (unsigned int), BUGreport (int); +extern int filnamchk (char*); struct kwdpair { @@ -122,6 +122,7 @@ return (i); ERRMOD (9); /*NOTREACHED*/ + return 0; } /** �⡼��ɽ��ɤ߹�� */ --- Wnn/romkan/rk_read.c +++ Wnn/romkan/rk_read.c @@ -51,16 +51,16 @@ #include "rk_header.h" #include "rk_extvars.h" -letter onescan (), *rangekettei (); -char *ename (); +letter onescan (letter**,letter*), *rangekettei (int,letter*); +char *ename (char*); -extern letter *ltrgrow (), *ltrend (), letterpick (), *ltr1cut (); -extern char *chrcat (), *strend (); +extern letter *ltrgrow (letter*,letter*), *ltrend (letter*), letterpick (uns_chr**), *ltr1cut (letter*); +extern char *chrcat (char*,char), *strend (char*); -static int termsscan (), evalandcpy (), eval1cpy (), partscan (), evlis (), atermscan (), serfun (), hensrc_tourk (), blankpass (), modsrcL (), chkL_get_int (); -static void ERRLIN (), ERHOPN (), readhyo (), ltr1tostr (), ERRHYO (), vchk (), rangeset (), de_bcksla (), listscan (), singleqscan (), doubleqscan (); -extern void BUGreport (), choosehyo (), readmode (); -extern int ltrcmp (), ltrstrcmp (), readfnm (), fixednamep (); +static int termsscan (register letter**,letter*,int), evalandcpy (register letter**,int), eval1cpy (letter**,int,int), partscan (register letter**,register letter*), evlis (int,letter**,int), atermscan (register letter**,register letter*,int), serfun (register letter*), hensrc_tourk (letter*,int), blankpass (register letter**,int), modsrcL (letter*), chkL_get_int (letter*,modetyp*,modetyp); +static void ERRLIN (unsigned int), ERHOPN (unsigned int), readhyo (int), ltr1tostr (letter,char**), ERRHYO (unsigned int), vchk (letter*), rangeset (int,letter*), de_bcksla (char*,char*), listscan (register letter**,register letter*), singleqscan (letter**,letter*), doubleqscan (letter**,letter*); +extern void BUGreport (int), choosehyo (void), readmode (char*); +extern int ltrcmp (letter*,letter*), ltrstrcmp (register letter*,register char*), readfnm (int (*readchar_func) (void),int (*unreadc_func) (int),int (*readstr_func) (char**,int),char**,int*), fixednamep (char*); #define IHENSU (1 << 24) /* ��ɽ��ξ�̣��Х��Ȥǡ��ѿ��ɽ�� */ #define IKANSU (2 << 24) /* �� ؿ��ɽ�� */ ++++++ FreeWnn-s390x.patch ++++++ --- /var/tmp/diff_new_pack.1mnK0l/_old 2010-03-26 01:15:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1mnK0l/_new 2010-03-26 01:15:19.000000000 +0100 @@ -1,172 +1,25 @@ -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c 2000-03-20 17:31:43.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c 2002-11-03 20:25:27.000000000 +0100 -@@ -158,11 +158,11 @@ - - int cur_clp; /** ��ߤΥ��饤��Ȥ��ֹ� **/ - --static int *all_socks; /** �ӥåȥѥ�� -+static fd_set *all_socks; /** �ӥåȥѥ�� - which jserver to select ��ݻ� **/ --static int *ready_socks; /** �ǡ��Τ��Ƥ��륽��åȤ� -+static fd_set *ready_socks; /** �ǡ��Τ��Ƥ��륽��åȤ� - �ӥåȥѥ��ݻ� **/ --static int *dummy1_socks, *dummy2_socks; -+static fd_set *dummy1_socks, *dummy2_socks; - - static int no_of_ready_socks; - static int sel_bwidth, /** bit width of all_socks **/ -@@ -171,9 +171,14 @@ - static int nofile; /** No. of files **/ - - #define BINTSIZE (sizeof(int)*8) -+/* - #define sock_set(array,pos) (array[pos/BINTSIZE] |= (1<<(pos%BINTSIZE))) - #define sock_clr(array,pos) (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE))) - #define sock_tst(array,pos) (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE))) -+*/ -+#define sock_set(array,pos) FD_SET(pos,array) -+#define sock_clr(array,pos) FD_CLR(pos,array) -+#define sock_tst(array,pos) FD_ISSET(pos,array) - - struct msg_cat *wnn_msg_cat; - struct msg_cat *js_msg_cat; -@@ -312,7 +317,7 @@ - for (;;) - { - #ifdef DEBUG -- error1 ("main loop: ready_socks = %02X\n", ready_socks); -+ error1 ("main loop: ready_socks = %02lX\n", ready_socks[0]); - #endif - if (get_client () == -1) - break; -@@ -341,11 +346,11 @@ - - nofile = NOFILE; - sel_w = (nofile - 1) / BINTSIZE + 1; -- all_socks = (int *) calloc (sel_w, (sizeof (int))); -- ready_socks = (int *) malloc (sel_w * (sizeof (int))); -- dummy1_socks = (int *) malloc (sel_w * (sizeof (int))); -- dummy2_socks = (int *) malloc (sel_w * (sizeof (int))); -- sel_width = sel_w * sizeof (int); /* byte width */ -+ all_socks = (fd_set *) calloc (sel_w, (sizeof (fd_set))); -+ ready_socks = (fd_set *) malloc (sel_w * (sizeof (fd_set))); -+ dummy1_socks = (fd_set *) malloc (sel_w * (sizeof (fd_set))); -+ dummy2_socks = (fd_set *) malloc (sel_w * (sizeof (fd_set))); -+ sel_width = sel_w * sizeof (fd_set); /* byte width */ - sel_bwidth = sel_width * 8; /* bit width */ - } - -@@ -366,7 +371,7 @@ - xerror ("select error"); - } - #ifdef DEBUG -- error1 ("select OK, ready_socks[0]=%02X, n-r-s=%x\n", ready_socks[0], no_of_ready_socks); -+ error1 ("select OK, ready_socks[0]=%02lX, n-r-s=%x\n", ready_socks[0], no_of_ready_socks); - #endif - } - -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c 2000-02-23 17:08:49.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c 2002-11-03 22:25:09.000000000 +0100 -@@ -134,7 +134,7 @@ - static void do_end (), open_pty (), open_ttyp (), do_main (), exec_cmd (), parse_options (), setsize (), get_rubout (), usage (), change_size (), default_usage (); - - /** �ᥤ�� */ --void -+int - main (argc, argv) - int argc; - char **argv; -@@ -923,7 +923,7 @@ - - /** �ᥤ��롼�� */ - --int sel_ptn; -+fd_set sel_ptn; - int pty_bit; - int tty_bit; - int ptyfd; -@@ -947,7 +947,8 @@ - - pty_bit = 1 << ptyfd; - tty_bit = 1 << ttyfd; -- sel_ptn = pty_bit | tty_bit; -+ FD_SET (ptyfd, &sel_ptn); -+ FD_SET (ttyfd, &sel_ptn); - - if (henkan_off_flag == 0) - { -@@ -1020,8 +1021,9 @@ - static unsigned char *bufend = outbuf; - static unsigned char *bufstart = outbuf; - int n; -- int rfds; -- int i, j, mask; -+ fd_set rfds; -+ int i, j; -+ fd_set mask; - unsigned char *p; - extern int henkan_off_flag; - struct timeval time_out; /* If your OS's select was implemented as -@@ -1063,9 +1065,9 @@ - time_out.tv_usec = 200 * 1000; /* 200 msec ��ԤĤΤ��! */ - for (rfds = sel_ptn; - #ifdef linux -- (sel_ret = select (20, &rfds, 0, 0, NULL)) < 0 && errno == EINTR; -+ (sel_ret = select (20, &rfds, NULL, NULL, NULL)) < 0 && errno == EINTR; - #else -- (sel_ret = select (20, &rfds, 0, 0, &time_out)) < 0 && errno == EINTR; -+ (sel_ret = select (20, &rfds, NULL, NULL, &time_out)) < 0 && errno == EINTR; - #endif - rfds = sel_ptn) - ; -@@ -1084,7 +1086,7 @@ - */ - } - -- if (rfds & pty_bit) -+ if (FD_ISSET(ptyfd, &rfds)) - { - if ((n = read (ptyfd, buf, BUFSIZ)) <= 0) - { -@@ -1116,13 +1118,13 @@ - p += j; - i -= j; - } -- mask = 1 << ttyfd; -+ FD_SET(ttyfd, &mask); - select (32, 0, &mask, 0, 0); - } - pop_cursor (); - } - } -- if (rfds & tty_bit) -+ if (FD_ISSET(ttyfd, &rfds)) - { - if ((n = read (ttyfd, buf, BUFSIZ)) > 0) - { -@@ -1778,7 +1780,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/error.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/error.c +@@ -82,7 +82,7 @@ + void + error_exit1 (x, y1, y2, y3, y4, y5) + char *x; +- int y1, y2, y3, y4, y5; ++ long y1, y2, y3, y4, y5; { - static unsigned char buf[BUFSIZ]; - int n; -- int rfds; -+ fd_set rfds; - - kk_restore_cursor (); - clr_line_all (); -@@ -1791,7 +1793,7 @@ - write (ptyfd, buf, n); - } - rfds = sel_ptn; -- select (20, &rfds, 0, 0, NULL); -+ select (20, &rfds, NULL, NULL, NULL); - if (rfds & pty_bit) - { - if ((n = read (ptyfd, buf, BUFSIZ)) <= 0) -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Xwnmo/xwnmo/do_socket.c FreeWnn-1.1.1-a017/Xsi/Xwnmo/xwnmo/do_socket.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Xwnmo/xwnmo/do_socket.c 2000-02-23 18:03:22.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Xwnmo/xwnmo/do_socket.c 2002-11-03 20:25:17.000000000 +0100 + /* Need care with buffer size */ + char buf[512]; +@@ -270,7 +270,7 @@ + void + out (x, y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, y11, y12) + char *x; +- int y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, y11, y12; ++ long y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, y11, y12; + { + if (!noisy) + return; +--- BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/do_socket.c ++++ BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/do_socket.c @@ -90,9 +90,9 @@ XIMCmblk *cblk; XIMCmblk *cur_cblk = NULL; @@ -196,22 +49,3 @@ extern int read (), write (); ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c 2002/11/05 14:57:21 1.1 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c 2002/11/05 14:58:12 -@@ -47,7 +47,7 @@ - void - error_exit1 (x, y1, y2, y3, y4, y5) - char *x; -- int y1, y2, y3, y4, y5; -+ long y1, y2, y3, y4, y5; - { - char buf[512]; - -@@ -112,7 +112,7 @@ - void - error1 (x, y1, y2, y3, y4, y5) - register char *x; -- int y1, y2, y3, y4, y5; -+ long y1, y2, y3, y4, y5; - { - char buf[512]; ++++++ FreeWnn-sighandler.patch ++++++ --- /var/tmp/diff_new_pack.1mnK0l/_old 2010-03-26 01:15:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1mnK0l/_new 2010-03-26 01:15:19.000000000 +0100 @@ -1,8 +1,8 @@ ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c Mon Mar 20 17:31:43 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c Tue Aug 29 12:06:47 2000 -@@ -185,6 +185,19 @@ - - char cmd_name[80]; +--- BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/de.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/de.c +@@ -212,6 +212,19 @@ + # include <tcpd.h> + #endif /* HAVE_LIBWRAP */ +#ifndef NOTFORK +static void father_sighandler (const int sig) @@ -19,21 +19,21 @@ + /* No arguments are used. Only options. */ int - main (argc, argv) -@@ -228,14 +241,14 @@ - #ifndef NOTFORK - if (fork ()) + main (int argc, char *argv[]) +@@ -248,14 +261,14 @@ { -- signal (SIGCHLD, _exit); -+ signal (SIGCHLD, father_sighandler); - signal (SIGHUP, SIG_IGN); - signal (SIGINT, SIG_IGN); - signal (SIGQUIT, SIG_IGN); + if (fork ()) + { +- signal (SIGCHLD, _exit); ++ signal (SIGCHLD, father_sighandler); + signal (SIGHUP, SIG_IGN); + signal (SIGINT, SIG_IGN); + signal (SIGQUIT, SIG_IGN); #ifdef SIGTSTP - signal (SIGTSTP, SIG_IGN); + signal (SIGTSTP, SIG_IGN); #endif -- signal (SIGTERM, _exit); -+ signal (SIGTERM, father_sighandler); - pause (); +- signal (SIGTERM, _exit); ++ signal (SIGTERM, father_sighandler); + pause (); + } } - #endif /* !NOTFORK */ ++++++ FreeWnn-trad_cpp.patch ++++++ --- Wnn/pubdicplus/Makefile.in +++ Wnn/pubdicplus/Makefile.in @@ -421,7 +421,7 @@ $(LN) $? $@ std.fzk: fzk.master-.c $(FZK_SRC) - $(CPP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + $(CPP) -traditional-cpp $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ full.fzk: $(FZK_SRC) $(MAKE) FZK_FLAG=-DKANSAI std.fzk --- cWnn/cdic/Makefile.in +++ cWnn/cdic/Makefile.in @@ -63,10 +63,10 @@ $(DICS): $(HINSI) $(FULL):: $(FZK_SRCS) con.master-.c - $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ $(FULLR):: $(FZK_SRCS) con.masterR-.c - $(CPP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ # To avoid circular dependency, we don't use 'con.master?.c' con.master-.c: con.master --- cWnn/tdic/Makefile.in +++ cWnn/tdic/Makefile.in @@ -63,10 +63,10 @@ $(DICS): $(HINSI) $(FULL):: $(FZK_SRCS) con.master-.c - $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ $(FULLR):: $(FZK_SRCS) con.masterR-.c - $(CPP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ # To avoid circular dependency, we don't use 'con.master?.c' con.master-.c: con.master --- kWnn/kdic/Makefile.in +++ kWnn/kdic/Makefile.in @@ -61,7 +61,7 @@ $(DICS): $(HINSI) $(FULL):: $(FZK_SRCS) fzk.master-.c - $(CPP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ # To avoid circular dependency, we don't use 'fzk.master.c' fzk.master-.c: fzk.master ++++++ FreeWnn-uum.patch ++++++ --- /var/tmp/diff_new_pack.1mnK0l/_old 2010-03-26 01:15:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1mnK0l/_new 2010-03-26 01:15:19.000000000 +0100 @@ -1,16 +1,6 @@ -diff -ur FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c Wed Feb 23 17:08:49 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c Wed Nov 1 19:33:54 2000 -@@ -638,7 +638,7 @@ - #ifdef SYSVR2 - #define index strchr - #endif /* SYSVR2 */ -- extern char *index (); -+/* extern char *index ();*/ - - strcpy (ostr, default_getoptstr); - strcat (ostr, lang_db->getoptstr); -@@ -1720,7 +1720,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/jhlp.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/jhlp.c +@@ -1755,7 +1755,7 @@ } #endif /* defined(uniosu) */ @@ -19,31 +9,18 @@ ptyname (nmbuf, ptynm, ptyno); if (chown (nmbuf, 0, 0) == ERROR) { -diff -ur FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/wnnrc_op.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/wnnrc_op.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/wnnrc_op.c Wed Feb 23 16:31:45 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/wnnrc_op.c Mon Oct 30 23:42:17 2000 -@@ -133,7 +133,7 @@ - struct passwd *u; - extern struct passwd *getpwnam (); - #if defined(SYSVR2) && !defined(AIXV3) -- extern char *strchr (); -+/* extern char *strchr (); */ - #endif /* defined(SYSVR2) && !defined(AIXV3) */ - - if (*s != '~' && *s != '@') -diff -u FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in.~1~ FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in ---- FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in.~1~ Sun Feb 13 10:15:54 2000 -+++ FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in Wed Nov 1 19:49:39 2000 -@@ -90,7 +90,7 @@ - ALLDEFINES = $(INCLUDES) -DFUNCPROTO=15 -DNARROWPROTO $(DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) +--- BUILD/FreeWnn-1.1.1-a021/makerule.mk.in ++++ BUILD/FreeWnn-1.1.1-a021/makerule.mk.in +@@ -94,7 +94,7 @@ + CFLAGS = @CFLAGS@ @CDEBUGFLAGS@ $(CCOPTIONS) @ipv6@ @DEFS@ $(ALLDEFINES) + LIBS = @LIBS@ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) --LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) -+LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) -L/usr/lib/termcap +-LDOPTIONS = @CDEBUGFLAGS@ $(CCOPTIONS) ++LDOPTIONS = @CDEBUGFLAGS@ $(CCOPTIONS) -L@libdir@/termcap - CCLINK = $(CC) -@@ -114,7 +114,7 @@ + # +@@ -112,7 +112,7 @@ WNNBINDIR = ${PREFIX}/bin WNNINCDIR = @includedir@ WNNLIBDIR = @libdir@ ++++++ FreeWnn-warnings.patch ++++++ --- /var/tmp/diff_new_pack.1mnK0l/_old 2010-03-26 01:15:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1mnK0l/_new 2010-03-26 01:15:19.000000000 +0100 @@ -1,17 +1,6 @@ ---- Wnn/etc/msg.c -+++ Wnn/etc/msg.c -@@ -228,7 +228,7 @@ - register struct msg_bd *bd; - if (cd->msg_bd == 0 || cd->msg_cnt == 0) - return (NULL); -- bd = (struct msg_bd *) bsearch (id, cd->msg_bd, cd->msg_cnt, sizeof (struct msg_bd), _search); -+ bd = (struct msg_bd *) bsearch ((void*)id, cd->msg_bd, cd->msg_cnt, sizeof (struct msg_bd), _search); - if (bd == NULL) - return (NULL); - return (bd->msg); --- Wnn/jlib.V3/jlv3.c +++ Wnn/jlib.V3/jlv3.c -@@ -341,7 +341,7 @@ +@@ -355,7 +355,7 @@ /* READ ONLY SD && hind file is none */ (js_access (jl_env (buf), fn, 4) != -1) && (js_access (jl_env (buf), fn1, 4) == -1)) { @@ -20,7 +9,7 @@ return (-1); if (jl_dic_delete (buf, dic_no) < 0) return (-1); -@@ -351,7 +351,7 @@ +@@ -365,7 +365,7 @@ { rdonly = WNN_DIC_RDONLY; } ++++++ fwnn-rpmlintrc ++++++ # This line is mandatory to access the configuration functions from Config import * addFilter(".*shlib-policy-name-error.*") addFilter(".*devel-file-in-non-devel-package.*") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgphoto2 for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '10

26 Mar '10

Hello community, here is the log from the commit of package libgphoto2 for openSUSE:Factory checked in at Fri Mar 26 01:14:14 CET 2010. -------- --- GNOME/libgphoto2/libgphoto2.changes 2010-01-25 11:22:18.000000000 +0100 +++ libgphoto2/libgphoto2.changes 2010-03-25 10:33:03.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Mar 25 09:48:06 CET 2010 - meissner(a)suse.de + +- disable hal inclusion +- updated to temp snapshot 2.4.8.1 + - new usbdiskdirect driver for certain picture frames + - new libgd dependency for picture frame + - new picture frame driver + - lots of PTP fixes and enhancements + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libgphoto2-2.4.8.tar.bz2 New: ---- libgphoto2-2.4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.xSecew/_old 2010-03-26 01:11:57.000000000 +0100 +++ /var/tmp/diff_new_pack.xSecew/_new 2010-03-26 01:11:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libgphoto2 (Version 2.4.8) +# spec file for package libgphoto2 (Version 2.4.8.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: libgphoto2 -BuildRequires: doxygen fdupes gcc-c++ hal-devel libexif-devel libjpeg-devel libusb-devel udev +BuildRequires: doxygen fdupes gcc-c++ gd-devel hal libexif-devel libjpeg-devel libusb-devel pkg-config udev Url: http://gphoto.org/ # bug437293 %ifarch ppc64 @@ -30,7 +30,7 @@ License: LGPLv2.1+ Group: Hardware/Camera Summary: A Digital Camera Library -Version: 2.4.8 +Version: 2.4.8.1 Release: 1 Source0: libgphoto2-%{version}.tar.bz2 Source1: baselibs.conf @@ -75,6 +75,7 @@ PATH="/usr/X11R6/bin:$PATH" \ %configure \ --with-doc-dir=%{_defaultdocdir}/%{name} \ + --without-hal \ --with-drivers=all make %{?jobs:-j%jobs} ++++++ libgphoto2-2.4.8.tar.bz2 -> libgphoto2-2.4.8.1.tar.bz2 ++++++ ++++ 274777 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gpg2 for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '10

26 Mar '10

Hello community, here is the log from the commit of package gpg2 for openSUSE:Factory checked in at Fri Mar 26 01:11:43 CET 2010. -------- --- gpg2/gpg2.changes 2010-02-18 14:18:40.000000000 +0100 +++ gpg2/gpg2.changes 2010-03-22 16:13:25.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 22 15:09:24 UTC 2010 - puzel(a)novell.com + +- fix files-are-digests patch (bnc#469229) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpg2.spec ++++++ --- /var/tmp/diff_new_pack.KOIz8z/_old 2010-03-26 01:08:12.000000000 +0100 +++ /var/tmp/diff_new_pack.KOIz8z/_new 2010-03-26 01:08:12.000000000 +0100 @@ -20,7 +20,7 @@ Name: gpg2 Version: 2.0.14 -Release: 2 +Release: 3 BuildRequires: expect BuildRequires: fdupes BuildRequires: libgpg-error-devel >= 1.4 ++++++ gnupg-files-are-digests.patch ++++++ --- /var/tmp/diff_new_pack.KOIz8z/_old 2010-03-26 01:08:13.000000000 +0100 +++ /var/tmp/diff_new_pack.KOIz8z/_new 2010-03-26 01:08:13.000000000 +0100 @@ -1,14 +1,14 @@ --- - g10/gpg.c | 3 ++ + g10/gpg.c | 4 +++ g10/options.h | 1 g10/sign.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- - 3 files changed, 65 insertions(+), 5 deletions(-) + 3 files changed, 66 insertions(+), 5 deletions(-) -Index: gnupg-2.0.13/g10/gpg.c +Index: gnupg-2.0.14/g10/gpg.c =================================================================== ---- gnupg-2.0.13.orig/g10/gpg.c 2009-08-05 12:09:24.000000000 +0200 -+++ gnupg-2.0.13/g10/gpg.c 2010-01-27 17:13:20.000000000 +0100 -@@ -338,6 +338,7 @@ enum cmd_and_opt_values +--- gnupg-2.0.14.orig/g10/gpg.c 2009-12-21 15:00:55.000000000 +0100 ++++ gnupg-2.0.14/g10/gpg.c 2010-03-22 15:05:00.000000000 +0100 +@@ -340,6 +340,7 @@ enum cmd_and_opt_values oTTYtype, oLCctype, oLCmessages, @@ -16,7 +16,7 @@ oXauthority, oGroup, oUnGroup, -@@ -700,6 +701,7 @@ static ARGPARSE_OPTS opts[] = { +@@ -705,6 +706,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-preferences","@"), ARGPARSE_s_s (oPersonalCompressPreferences, "personal-compress-preferences", "@"), @@ -24,18 +24,26 @@ /* Aliases. I constantly mistype these, and assume other people do as well. */ -@@ -2850,6 +2852,7 @@ main (int argc, char **argv) - - case oLCctype: opt.lc_ctype = pargs.r.ret_str; break; - case oLCmessages: opt.lc_messages = pargs.r.ret_str; break; -+ case oFilesAreDigests: opt.files_are_digests = pargs.r.ret_str; break; - - case oGroup: add_group(pargs.r.ret_str); break; - case oUnGroup: rm_group(pargs.r.ret_str); break; -Index: gnupg-2.0.13/g10/options.h +@@ -1998,6 +2000,7 @@ main (int argc, char **argv) + opt.def_cert_expire="0"; + set_homedir ( default_homedir () ); + opt.passwd_repeat=1; ++ opt.files_are_digests=0; + + /* Check whether we have a config file on the command line. */ + orig_argc = argc; +@@ -2481,6 +2484,7 @@ main (int argc, char **argv) + case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break; + case oForceV3Sigs: opt.force_v3_sigs = 1; break; + case oNoForceV3Sigs: opt.force_v3_sigs = 0; break; ++ case oFilesAreDigests: opt.files_are_digests = 1; break; + case oForceV4Certs: opt.force_v4_certs = 1; break; + case oNoForceV4Certs: opt.force_v4_certs = 0; break; + case oForceMDC: opt.force_mdc = 1; break; +Index: gnupg-2.0.14/g10/options.h =================================================================== ---- gnupg-2.0.13.orig/g10/options.h 2009-07-07 09:40:19.000000000 +0200 -+++ gnupg-2.0.13/g10/options.h 2010-01-27 16:42:03.000000000 +0100 +--- gnupg-2.0.14.orig/g10/options.h 2009-09-21 18:53:51.000000000 +0200 ++++ gnupg-2.0.14/g10/options.h 2010-03-22 11:34:09.000000000 +0100 @@ -194,6 +194,7 @@ struct int no_auto_check_trustdb; int preserve_permissions; @@ -44,10 +52,10 @@ struct groupitem *grouplist; int mangle_dos_filenames; int enable_progress_filter; -Index: gnupg-2.0.13/g10/sign.c +Index: gnupg-2.0.14/g10/sign.c =================================================================== ---- gnupg-2.0.13.orig/g10/sign.c 2009-05-11 10:14:54.000000000 +0200 -+++ gnupg-2.0.13/g10/sign.c 2010-01-27 16:59:09.000000000 +0100 +--- gnupg-2.0.14.orig/g10/sign.c 2009-09-21 18:53:51.000000000 +0200 ++++ gnupg-2.0.14/g10/sign.c 2010-03-22 16:07:47.000000000 +0100 @@ -662,8 +662,12 @@ write_signature_packets (SK_LIST sk_list mk_notation_policy_etc (sig, NULL, sk); } @@ -128,7 +136,7 @@ + gcry_md_final(mfx.md); + /* this assumes gcry_md_read returns the same buffer */ + mdb = gcry_md_read(mfx.md, opt.def_digest_algo); -+ (void) gcry_md_algo_info (opt.def_digest_algo, GCRYCTL_GET_ASNOID, NULL, &mdlen); ++ mdlen = gcry_md_get_algo_dlen(opt.def_digest_algo); + if (strlen(fname) != mdlen * 2 + 11) + log_bug("digests must be %d + @ + 5 bytes\n", mdlen); + d = -1; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0