Re: Patches status: some of the stolen_from_HEAD patches
On Fri, Jan 09, 2004 at 12:33:18AM -0500, Nathanael Nerode wrote: 000_stolen_from_HEAD_xlib - This patch is *ing huge, and took a tediously long time to check, just due to the need to go through so many files. Entirely present in upstream 4.3. A number of the files have additional bug fixes in HEAD, but I'm not going to even think about that right now. :-) Yup. The important ones can be backported later on a case-by-case basis. All we're trying to do now is prevent regressions. 000_stolen_from_HEAD_xman - Entirely present in upstream 4.3. 000_stolen_from_HEAD_xtt Entirely present in upstream 4.3. Great. Thank you very much! -- G. Branden Robinson| If we believe absurdities, we Debian GNU/Linux | shall commit atrocities. [EMAIL PROTECTED] | -- Voltaire http://people.debian.org/~branden/ | signature.asc Description: Digital signature
X Strike Force XFree86 SVN commit: rev 886 - branches/4.3.0/sid/debian
Author: branden Date: 2004-01-12 12:24:04 -0500 (Mon, 12 Jan 2004) New Revision: 886 Modified: branches/4.3.0/sid/debian/TODO Log: Remove Xft compilation problem; resolved by debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff. Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2004-01-08 12:57:32 UTC (rev 885) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 17:24:04 UTC (rev 886) @@ -4,8 +4,6 @@ -1 -- -* Fix Xft compilation problem (same as #221129). - * ensure packages are at least as functional on the architectures in testing as the 4.2.1 packages are (so that no arch sees a horrendous regression)
Processed: tagging 225520
Processing commands for [EMAIL PROTECTED]: # Automatically generated email from bts, devscripts version 2.7.95.1 tags 225520 + wontfix Bug#225520: Diff of NMU 1.0.2-3.1 Tags were: patch Tags added: wontfix End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
X Strike Force XFree86 SVN commit: rev 890 - branches/4.3.0/sid/debian
Author: branden Date: 2004-01-12 13:09:28 -0500 (Mon, 12 Jan 2004) New Revision: 890 Modified: branches/4.3.0/sid/debian/TODO Log: Add some post 4.3.0-1 items per Nathanael Nerode. Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2004-01-12 18:03:13 UTC (rev 889) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 18:09:28 UTC (rev 890) @@ -216,6 +216,11 @@ * move docs from xspecs to -dev packages as appropriate * Ensure the lists of programs in the xbase-clients and xutils package descriptions are up-to-date. +* move patch in 009_use_xf86config-4_in_xf86config.diff to + 911_debian_XF86Config_to_XF86Config-4.diff +* 006_dont_ref_rman.man.diff: different fix exists upstream; steal it from HEAD +* 013_xkb_symbols_euro_support.diff: different fix exists upstream; steal it + from HEAD Probably for 4.4.0 ==
X Strike Force XFree86 SVN commit: rev 887 - branches/4.3.0/sid/debian
Author: branden Date: 2004-01-12 12:57:03 -0500 (Mon, 12 Jan 2004) New Revision: 887 Modified: branches/4.3.0/sid/debian/TODO Log: Update patch status per Nathanael Nerode. Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2004-01-12 17:24:04 UTC (rev 886) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 17:57:03 UTC (rev 887) @@ -57,12 +57,12 @@ 008_doc_extensions_fix.diffupstreamin 000_stolen_from_HEAD_doc_extensions.diff 009_s3_trio64v2_dx_and_gx_support.diff unchanged renamed to 010_s3_trio64_dx_and_gx_support.diff 010_linux_apm_vetoed_suspend_fix.diff upstream -011_chinese_locale_fixups.diff -012_fix_cyrillic_font_aliases.diff -013_wacom_wait_longer_for_input.diff -014_document_grab_key_sequences.diff -015_lbxproxy_segfault_fix.diff -016_mga_manpage_updates.diff +011_chinese_locale_fixups.diff upstreamon xf-4_3-branch +012_fix_cyrillic_font_aliases.diff NOT PORTED will need to be renumbered +013_wacom_wait_longer_for_input.diff merged renamed and expanded to 036_wacom_usb_tablet_update patch +014_document_grab_key_sequences.diff upstream +015_lbxproxy_segfault_fix.diff upstream +016_mga_manpage_updates.diff NOT PORTED 017_xrandr_manpage_fixups.diff merged 041_fix_Xlib_depend_target.diff 018_r128_dri_lines_points_fix.diff 019_r128_xv_byteswap_yuy2_uyvy_fix.diff
X Strike Force XFree86 SVN commit: rev 893 - branches/4.3.0/sid/debian
Author: branden Date: 2004-01-12 13:15:50 -0500 (Mon, 12 Jan 2004) New Revision: 893 Modified: branches/4.3.0/sid/debian/TODO Log: Add post-4.3.0-1 item regarding the xserver-xfree86 debconfage. Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2004-01-12 18:14:12 UTC (rev 892) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 18:15:50 UTC (rev 893) @@ -190,6 +190,8 @@ - If /var/run/$DIR migration file exists: + remove /usr/X11R6/lib/X11/$DIR symlink + mv /etc/X11/$DIR back to /usr/X11R6/lib/X11/$DIR +* Rewrite xserver-xfree86 debconfage. Joey Hess and Eduard Bloch have provided + good input. * Bug #216806: aoutloader missing header file for ntohl * Fix upstream install rule that prevents Xcursor themes from being installed on s390. As I understand it, this is client-side stuff and
libxcursor.so should be moved into package libxcursor1
Hi all, I don't know if this can be tagged as a bug, but I think there's a problem with packages libxcursor-dev and libxcursor1: the file /usr/lib/libxcursor.so should be moved into the package libxcursor1 (and not libxcursor-dev), otherwise you cannot benefit from the XRender cursors unlike you install the libxcursor-dev devel package too. It's unlikely that end-users will install libxcursor-dev anyway... What do you think about it ? Best regards :) Damien
X Strike Force XFree86 SVN commit: rev 888 - branches/4.3.0/sid/debian
Author: branden Date: 2004-01-12 13:01:16 -0500 (Mon, 12 Jan 2004) New Revision: 888 Modified: branches/4.3.0/sid/debian/TODO Log: Update patch status per Nathanael Nerode. Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2004-01-12 17:57:03 UTC (rev 887) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 18:01:16 UTC (rev 888) @@ -42,9 +42,9 @@ 000_stolen_from_HEAD_savage_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged 000_stolen_from_HEAD_xaw.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged 000_stolen_from_HEAD_xdm.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged -000_stolen_from_HEAD_xlib.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged -000_stolen_from_HEAD_xman.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged -000_stolen_from_HEAD_xtt.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged +000_stolen_from_HEAD_xlib.diff irrelevant +000_stolen_from_HEAD_xman.diff irrelevant +000_stolen_from_HEAD_xtt.diff irrelevant 001_linux_cf.diff UNDER INVESTIGATION 001a_damn_cpp_3.3_to_hell.diff merged renamed to 003a_damn_cpp_3.3_to_hell.diff 001b_m68k_haslinuxinput_too.diff merged now part of 003_linux.cf_and_xfree86.cf.diff
X Strike Force XFree86 SVN commit: rev 892 - branches/4.3.0/sid/debian
Author: branden Date: 2004-01-12 13:14:12 -0500 (Mon, 12 Jan 2004) New Revision: 892 Modified: branches/4.3.0/sid/debian/TODO Log: Update patch status per Nathanael Nerode. Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2004-01-12 18:10:48 UTC (rev 891) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 18:14:12 UTC (rev 892) @@ -64,12 +64,12 @@ 015_lbxproxy_segfault_fix.diff upstream 016_mga_manpage_updates.diff NOT PORTED 017_xrandr_manpage_fixups.diff merged 041_fix_Xlib_depend_target.diff -018_r128_dri_lines_points_fix.diff -019_r128_xv_byteswap_yuy2_uyvy_fix.diff -020_xkb_symbols_euro_support.diff -021_startx_hostname_fix.diff -022_Xaw_StripChart_fix.diff -023_mga_use_hal_modeinit_workarounds_for_g550.diff +018_r128_dri_lines_points_fix.diff irrelevant +019_r128_xv_byteswap_yuy2_uyvy_fix.diffupstream +020_xkb_symbols_euro_support.diff unchanged renamed to 013_xkb_symbols_euro_support +021_startx_hostname_fix.diff unchanged renamed to 014_startx_hostname_fix +022_Xaw_StripChart_fix.diffunchanged renamed to 012_Xaw_StripChart_fix +023_mga_use_hal_modeinit_workarounds_for_g550.diff upstream 024_ati_busmaster_vt_switch_hang_fix.diff 026_tdfx_double_buffering_for_xvideo.diff 027_abnt2_keycode_fix.diff
Re: Patches status: 018-023
On Fri, Jan 09, 2004 at 02:49:39AM -0500, Nathanael Nerode wrote: More trunk patches vs. 4.3 :-) 018_r128_dri_lines_points_fix 019_r128_xv_byteswap_yuy2_uyvy_fix 020_xkb_symbols_euro_support 021_startx_hostname_fix 022_Xaw_StripChart_fix 023_mga_use_hal_modeinit_workarounds_for_g550 I've updated the TODO file for all of these. Thank you once again for your invaluable help in this task. -- G. Branden Robinson| I suspect Linus wrote that in a Debian GNU/Linux | complicated way only to be able to [EMAIL PROTECTED] | have that comment in there. http://people.debian.org/~branden/ | -- Lars Wirzenius signature.asc Description: Digital signature
X Strike Force XFree86 SVN commit: rev 896 - in branches/4.3.0/sid/debian: . patches
Author: branden Date: 2004-01-12 14:54:30 -0500 (Mon, 12 Jan 2004) New Revision: 896 Added: branches/4.3.0/sid/debian/patches/046_fix_cyrillic_font_aliases.diff Modified: branches/4.3.0/sid/debian/TODO Log: Restore patch #012 from trunk that was lost. Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2004-01-12 19:07:13 UTC (rev 895) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 19:54:30 UTC (rev 896) @@ -58,7 +58,7 @@ 009_s3_trio64v2_dx_and_gx_support.diff unchanged renamed to 010_s3_trio64_dx_and_gx_support.diff 010_linux_apm_vetoed_suspend_fix.diff upstream 011_chinese_locale_fixups.diff upstreamon xf-4_3-branch -012_fix_cyrillic_font_aliases.diff NOT PORTED will need to be renumbered +012_fix_cyrillic_font_aliases.diff merged renamed to 046_fix_cyrillic_font_aliases 013_wacom_wait_longer_for_input.diff merged renamed and expanded to 036_wacom_usb_tablet_update patch 014_document_grab_key_sequences.diff upstream 015_lbxproxy_segfault_fix.diff upstream Copied: branches/4.3.0/sid/debian/patches/046_fix_cyrillic_font_aliases.diff (from rev 895, trunk/debian/patches/012_fix_cyrillic_font_aliases.diff) === --- trunk/debian/patches/012_fix_cyrillic_font_aliases.diff 2004-01-12 19:07:13 UTC (rev 895) +++ branches/4.3.0/sid/debian/patches/046_fix_cyrillic_font_aliases.diff 2004-01-12 19:54:30 UTC (rev 896) @@ -0,0 +1,73 @@ +$Id$ + +Prevent font alias collisions between KOI8-R encodings and the stock ones. + +This patch by Branden Robinson. + +Not submitted upstream. Not sure they'd like it. + +--- xc/fonts/bdf/cyrillic/fonts.alias.orig 2004-01-12 14:46:15.0 -0500 xc/fonts/bdf/cyrillic/fonts.alias 2004-01-12 14:46:23.0 -0500 +@@ -9,31 +9,31 @@ + ! + ! $XFree86: xc/fonts/bdf/cyrillic/fonts.alias,v 3.4 2002/12/15 01:49:06 dawes Exp $ + ! +-fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r +-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r +-5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r +-6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r +-6x10 -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r +-6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r +-6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r +-7x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r +-7x14b -misc-fixed-bold-r-normal--14-130-75-75-c-70-koi8-r +-8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r +-8x16 -misc-fixed-medium-r-normal--16-160-75-75-c-80-koi8-r +-8x16bold -misc-fixed-bold-r-normal--16-160-75-75-c-80-koi8-r +-9x15 -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r +-9x15bold -misc-fixed-bold-r-normal--15-140-75-75-c-90-koi8-r +-9x18 -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r +-9x18bold -misc-fixed-bold-r-normal--18-120-100-100-c-90-koi8-r +-10x16bold -cronyx-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r +-10x20 -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r +-12x24 -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r +-12x24bold -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r +-nil2 -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r ++fixed-cyrillic -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r ++variable-cyrillic -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r ++5x8-cyrillic -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r ++6x9-cyrillic -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r ++6x10-cyrillic -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r ++6x13-cyrillic -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r ++6x13bold-cyrillic -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r ++7x14-cyrillic -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r ++7x14b-cyrillic -misc-fixed-bold-r-normal--14-130-75-75-c-70-koi8-r ++8x13-cyrillic -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r ++8x16-cyrillic -misc-fixed-medium-r-normal--16-160-75-75-c-80-koi8-r ++8x16bold-cyrillic -misc-fixed-bold-r-normal--16-160-75-75-c-80-koi8-r ++9x15-cyrillic -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r ++9x15bold-cyrillic -misc-fixed-bold-r-normal--15-140-75-75-c-90-koi8-r ++9x18-cyrillic -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r ++9x18bold-cyrillic -misc-fixed-bold-r-normal--18-120-100-100-c-90-koi8-r ++10x16bold-cyrillic -cronyx-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r ++10x20-cyrillic -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r ++12x24-cyrillic -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r ++12x24bold-cyrillic -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r
Processed: Re: Bug#226545: XFree86 cursor themes not working
Processing commands for [EMAIL PROTECTED]: reassign 226545 libx11-6 Bug#226545: XFree86 cursor themes not working Bug reassigned from package `libxcursor1' to `libx11-6'. retitle 226545 libx11-6: bad search for libXcursor shared object when built against external Xcursor source Bug#226545: XFree86 cursor themes not working Changed Bug title. reopen 204358 Bug#204358: xlibs: [libX11] attempts to dlopen() libXcursor.so, not libXcursor.so.1 Bug is already open, cannot reopen. reassign 204358 libx11-6 Bug#204358: xlibs: [libX11] attempts to dlopen() libXcursor.so, not libXcursor.so.1 Bug reassigned from package `xlibs' to `libx11-6'. retitle 204358 libx11-6: attempts to dlopen() Xcursor library with bad filename Bug#204358: xlibs: [libX11] attempts to dlopen() libXcursor.so, not libXcursor.so.1 Changed Bug title. merge 204358 226545 Bug#204358: libx11-6: attempts to dlopen() Xcursor library with bad filename Bug#226545: libx11-6: bad search for libXcursor shared object when built against external Xcursor source Mismatch - only Bugs in same state can be merged: Values for `severity' don't match: #204358 has `important'; #226545 has `normal' tag 204358 = upstream experimental Bug#204358: libx11-6: attempts to dlopen() Xcursor library with bad filename Tags were: fixed-in-experimental experimental upstream sid Tags set to: upstream, experimental thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
X Strike Force XFree86 SVN commit: rev 889 - branches/4.3.0/sid/debian
Author: branden Date: 2004-01-12 13:03:13 -0500 (Mon, 12 Jan 2004) New Revision: 889 Modified: branches/4.3.0/sid/debian/TODO Log: Update patch status per Nathanael Nerode. Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2004-01-12 18:01:16 UTC (rev 888) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 18:03:13 UTC (rev 889) @@ -34,12 +34,12 @@ trunk/debian/patches file status notes 000_post421-2003.02.18.diffirrelevant 000_stolen_from_HEAD.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged -000_stolen_from_HEAD_ati_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged -000_stolen_from_HEAD_cyrix_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged -000_stolen_from_HEAD_neomagic_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged -000_stolen_from_HEAD_newport_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged -000_stolen_from_HEAD_nv_driver.diffcheck for stuff stolen from HEAD after xf-4_3_0 was tagged -000_stolen_from_HEAD_savage_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged +000_stolen_from_HEAD_ati_driver.diff irrelevant +000_stolen_from_HEAD_cyrix_driver.diff irrelevant +000_stolen_from_HEAD_neomagic_driver.diff irrelevant +000_stolen_from_HEAD_newport_driver.diff irrelevant +000_stolen_from_HEAD_nv_driver.diffirrelevant +000_stolen_from_HEAD_savage_driver.diffirrelevant 000_stolen_from_HEAD_xaw.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged 000_stolen_from_HEAD_xdm.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged 000_stolen_from_HEAD_xlib.diff irrelevant
X Strike Force XFree86 SVN commit: rev 894 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2004-01-12 14:06:24 -0500 (Mon, 12 Jan 2004)
New Revision: 894
Added:
branches/4.3.0/sid/debian/patches/003b_xfs_fixes.diff
Log:
Restore parts of patch #003 from 4.2.1 packages that were lost.
Added: branches/4.3.0/sid/debian/patches/003b_xfs_fixes.diff
===
--- branches/4.3.0/sid/debian/patches/003b_xfs_fixes.diff 2004-01-12
18:15:50 UTC (rev 893)
+++ branches/4.3.0/sid/debian/patches/003b_xfs_fixes.diff 2004-01-12
19:06:24 UTC (rev 894)
@@ -0,0 +1,192 @@
+$Id$
+
+This patch by Branden Robinson, Matthieu Herrb, and Nikita V. Youshchenko.
+
+os/utils.c:
+ - Handle pid files the way most other Unix daemons do. Use Matthieu
+Herrb's version of StorePid(), which refuses to open pre-existing pid
+files, and is more careful with the type of Pid_t.
+ - Allow the user to specify the pid filename on the command line with a
+-pid option (courtesy of Nikita V. Youshchenko).
+ - Whitespace police.
+
+xfs.man:
+ - Document the new -pid option (courtesy of Nikita V. Youshchenko).
+
+Not submitted upstream yet.
+
+--- xc/programs/xfs/os/utils.c~2004-01-12 13:49:11.0 -0500
xc/programs/xfs/os/utils.c 2004-01-12 13:52:23.0 -0500
+@@ -3,7 +3,7 @@
+ * misc os utilities
+ */
+ /*
+-
++
+ Copyright 1990, 1991, 1998 The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+@@ -27,7 +27,7 @@
+ in this Software without prior written authorization from The Open Group.
+
+ * Copyright 1990, 1991 Network Computing Devices;
+- * Portions Copyright 1987 by Digital Equipment Corporation
++ * Portions Copyright 1987 by Digital Equipment Corporation
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+@@ -219,7 +219,7 @@
+ static void
+ usage(void)
+ {
+-fprintf(stderr, usage: %s [-config config_file] [-port tcp_port]
[-droppriv] [-daemon] [-nodaemon] [-user user_name] [-ls listen_socket]\n,
++fprintf(stderr, usage: %s [-config config_file] [-daemon] [-droppriv]
[-ls listen_socket] [-nodaemon] [-pid pid_file] [-port tcp_port] [-user
user_name]\n,
+ progname);
+ exit(1);
+ }
+@@ -242,7 +242,7 @@
+ *
+ * [] denotes optional and ... denotes repitition.
+ *
+- * The string must be _exactly_ in the above format.
++ * The string must be _exactly_ in the above format.
+ */
+
+ void
+@@ -260,7 +260,7 @@
+ count++;
+ ptr++;
+ }
+-
++
+ OldListenCount = count + 1;
+ OldListen = (OldListenRec *) malloc (
+ OldListenCount * sizeof (OldListenRec));
+@@ -349,6 +349,11 @@
+ configfilename = argv[++i];
+ else
+ usage();
++ } else if (!strcmp(argv[i], -pid)) {
++ if (argv[i + 1])
++ pidFile = argv[++i];
++ else
++ usage();
+ }
+ #ifdef MEMBUG
+ else if ( strcmp( argv[i], -alloc) == 0)
+@@ -392,7 +397,7 @@
+ FSalloc (unsigned long amount)
+ {
+ register pointer ptr;
+-
++
+ if ((long)amount 0)
+ return 0;
+ if (amount == 0)
+@@ -462,21 +467,21 @@
+ FatalError(out of memory\n);
+ return 0;
+ }
+-
++
+ /*
+ * FSfree
+- *calls free
+- */
++ *calls free
++ */
+
+ void
+ FSfree(pointer ptr)
+ {
+ #ifdef MEMBUG
+ if (ptr)
+- ffree((char *)ptr);
++ ffree((char *)ptr);
+ #else
+ if (ptr)
+- free((char *)ptr);
++ free((char *)ptr);
+ #endif
+ }
+
+@@ -523,7 +528,7 @@
+ void
+ SetDaemonState(void)
+ {
+-int oldpid;
++long oldpid;
+
+ if (becomeDaemon) {
+ BecomeOrphan();
+@@ -540,30 +545,53 @@
+ }
+
+
+-static int
++static long
+ StorePid (void)
+ {
+-int oldpid;
++long oldpid;
++char pidstr[11]; /* enough space for a 32-bit pid plus \0 */
++size_tpidstrlen;
+
+-if (pidFile[0] != '\0') {
+- pidFd = open (pidFile, O_RDWR);
+- if (pidFd == -1 errno == ENOENT)
+- pidFd = open (pidFile, O_RDWR|O_CREAT, 0666);
+- if (pidFd == -1 || !(pidFilePtr = fdopen (pidFd, r+)))
++if (pidFile[0] != '\0')
++{
++ pidFd = open (pidFile, O_WRONLY|O_CREAT|O_EXCL, 0666);
++ if (pidFd == -1)
+ {
+- ErrorF (cannot open process-id file %s: %s\n, pidFile,
+- strerror (errno));
+- return -1;
++ if (errno == EEXIST)
++ {
++ /* pidFile already exists; see if we can open it */
++ pidFilePtr = fopen (pidFile, r);
++ if (pidFilePtr == NULL)
++ {
++ ErrorF (cannot open process-id file %s for reading:
++ %s\n, pidFile, strerror (errno));
++ return -1;
++ }
++ if
X Strike Force XFree86 SVN commit: rev 895 - branches/4.3.0/sid/debian
Author: branden Date: 2004-01-12 14:07:13 -0500 (Mon, 12 Jan 2004) New Revision: 895 Modified: branches/4.3.0/sid/debian/TODO Log: Update patch status. Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2004-01-12 19:06:24 UTC (rev 894) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 19:07:13 UTC (rev 895) @@ -49,7 +49,7 @@ 001a_damn_cpp_3.3_to_hell.diff merged renamed to 003a_damn_cpp_3.3_to_hell.diff 001b_m68k_haslinuxinput_too.diff merged now part of 003_linux.cf_and_xfree86.cf.diff 002_xdm_fixes.diff merged -003_xfs-fixes.diff INCOMPLETE os/utils.c and xfs.man still need to be patched; the rest is upstream +003_xfs-fixes.diff merged renamed to 003b_xfs_fixes.diff 004_xfree86_cf.diffupstream 005_rgb.txt_in_etc_X11.diffunchanged 006_XftConfig_in_correct_place.diffirrelevant
Bug#226545: XFree86 cursor themes not working [confirmation]
Harri, Thanks for the bug report. I can confirm this bug for my sid system as well. One question: are you running Gnome? I noticed after some upgrade some day (not sure which day, which upgrade) that my cursor theme stopped appearing for Gnome. I asked around and no one was confirming this for me, until I found your report on the BTS. The thing that boggles my mind about this bug is that the few KDE apps I run (K3B for example) were picking up my custom cursors from the Freedesktop.org defined spot (~/.icons) but Gnome was not. Once I symlinked libXcursor.so to libXcursor.so.1.0.1, Gnome was working as well. That's why I ask if you run Gnome. Or, more specifically, I'm trying to figure out if this is a libxcursor bug, or a Gnome bug. I'm not really sure. Don't know enough about it. But, the real bottom line is: bug confirmed. At least for a fix, the libxcursor maintainer should create your symlink to make KDE and Gnome both happy. Can any KDE users report on their experience with the current libxcursor, and perhaps check if Gnome is working with it or not? -Andrew
X Strike Force XFree86 SVN commit: rev 897 - in branches/4.3.0/sid/debian: . patches
Author: branden Date: 2004-01-12 15:22:15 -0500 (Mon, 12 Jan 2004) New Revision: 897 Added: branches/4.3.0/sid/debian/patches/047_mga_manpage_updates.diff Modified: branches/4.3.0/sid/debian/TODO Log: Restore patch #016 from trunk that was lost. Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2004-01-12 19:54:30 UTC (rev 896) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 20:22:15 UTC (rev 897) @@ -62,7 +62,7 @@ 013_wacom_wait_longer_for_input.diff merged renamed and expanded to 036_wacom_usb_tablet_update patch 014_document_grab_key_sequences.diff upstream 015_lbxproxy_segfault_fix.diff upstream -016_mga_manpage_updates.diff NOT PORTED +016_mga_manpage_updates.diff merged renamed to 047_mga_manpage_updates 017_xrandr_manpage_fixups.diff merged 041_fix_Xlib_depend_target.diff 018_r128_dri_lines_points_fix.diff irrelevant 019_r128_xv_byteswap_yuy2_uyvy_fix.diffupstream Copied: branches/4.3.0/sid/debian/patches/047_mga_manpage_updates.diff (from rev 896, trunk/debian/patches/016_mga_manpage_updates.diff) === --- trunk/debian/patches/016_mga_manpage_updates.diff 2004-01-12 19:54:30 UTC (rev 896) +++ branches/4.3.0/sid/debian/patches/047_mga_manpage_updates.diff 2004-01-12 20:22:15 UTC (rev 897) @@ -0,0 +1,180 @@ +$Id$ + +This patch by Branden Robinson. + +Not submitted upstream yet. + +--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man.orig2003-01-25 21:17:28.0 -0500 xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man 2004-01-12 15:18:29.0 -0500 +@@ -1,7 +1,7 @@ +-.\ $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man,v 1.6 2003/01/26 02:17:28 dawes Exp $ ++.\ $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man,v 1.6 2003/01/26 02:17:28 dawes Exp $ + .\ shorthand for double quote that works everywhere. + .ds q \N'34' +-.TH MGA __drivermansuffix__ __vendorversion__ ++.TH mga __drivermansuffix__ __vendorversion__ + .SH NAME + mga \- Matrox video driver + .SH SYNOPSIS +@@ -13,57 +13,61 @@ + .B EndSection + .fi + .SH DESCRIPTION +-.B mga ++.B mga + is an XFree86 driver for Matrox video cards. The driver is fully +-accelerated, and provides support for the following framebuffer depths: +-8, 15, 16, 24, and an 8+24 overlay mode. All +-visual types are supported for depth 8, and both TrueColor and DirectColor +-visuals are supported for the other depths except 8+24 mode which supports +-PseudoColor, GrayScale and TrueColor. Multi-card configurations +-are supported. XVideo is supported on G200 and newer systems, with ++accelerated, and provides support for the following framebuffer depths: 8, ++15, 16, 24, and an 8+24 overlay mode. All visual types are supported for ++depth 8, and both TrueColor and DirectColor visuals are supported for the ++other depths except 8+24 mode which supports PseudoColor, GrayScale and ++TrueColor. Multi\-card configurations are supported. XVideo is supported ++on G200 and newer systems, with + either + .B TexturedVideo +-or video overlay. The second head of dual-head cards is supported for +-the G450 and G550. Support for the second head on G400 cards requires +-a binary-only mga_hal module that is available from Matrox +-http://www.matrox.com, and may be on the CD supplied with the card. +-That module also provides various other enhancements, +-and may be necessary to use the DVI (digital) output on the G550 +-(and other cards). +-.SH SUPPORTED HARDWARE ++or video overlay. The second head of dual\-head cards is supported for the ++G450 and G550. Support for the second head on G400 cards requires a ++binary\-only mga_hal module that is available from Matrox ++http://www.matrox.com, and may be on the CD supplied with the card. That ++module also provides various other enhancements, and may be necessary to ++use the DVI (digital) output on the G550 (and other cards). ++.SH SUPPORTED HARDWARE + The + .B mga +-driver supports PCI and AGP video cards based on the following Matrox chips: +-.TP 12 ++driver supports PCI and AGP video cards based on the following Matrox ++chips. They are listed in approximate chronological order of production ++(with the most recent chipsets listed last), so consult this list when you ++are unsure whether your card is meant when references are made to \(oqG200 ++and later\(cq chips, for example. ++.TP + .B MGA2064W +-Millennium (original) +-.TP 12 ++Millennium \fI(original)\fP ++.TP + .B MGA1064SG + Mystique +-.TP 12 ++.TP + .B MGA2164W + Millennium II +-.TP 12 ++.TP + .B G100 +-.TP 12 ++Productiva G100 ++.TP + .B G200 + Millennium G200 and Mystique G200 +-.TP 12 ++.TP + .B G400 +-.TP 12 +-.B G450
Re: X Server Fatal Error, Signal 11
On Thu, Jan 08, 2004 at 08:12:55PM -0800, Ryan Morgan wrote: Hi all, was wondering if anyone could offer some assistance. I just installed Debian Woody on an IBM Thinkpad (specs below). I believe I have XF86Config-4 configured properly for my video setup, because I've found other users with the same machine and used the same applicable settings (driver, HorizSync, VertRefresh, etc). However the X server refuses to start, with this complaint: Fatal server error: Caught signal 11. Server aborting (entire log file below) I've searched high and low with not much luck on how to correct this error. Any thoughts? [The following is a form letter.] Hello, You recently sent an off-charter message to the debian-x mailing list. First, I will offer an explanation of what this mailing list's purpose is; I will then suggest some alternative forums for your message or concern. The full charter of the mailing list follows. This list is for the discussion and support of the X Window System within Debian. Issues of maintenance and porting of Debian's XFree86 packages are germane here, as are discussions of possible Debian policy mechanisms for ensuring the smooth interoperation of packages that use the X Window System, particularly widget sets, desktop environments, window managers, display managers, and packages that provide fonts for the X Window System. In particular, individuals involved with building official Debian XFree86 packages for any architecture are invited to join, as are those with various graphics hardware who seek to reproduce and/or fix bugs in the X server. This is not a user support list; this list is intended for those who deal with the source code of any of the X Window System components mentioned above. If you are experiencing a problem, the first thing to check is the Debian X FAQ. This FAQ is available on the World Wide Web: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/FAQ The FAQ is also available on any Debian system that has the xfree86-common package installed. You can use the command dpkg --status xfree86-common at a shell prompt to determine whether you have the xfree86-common package installed (this technique works with any other package name as well). For instance, when I run this command I see the following: $ dpkg --status xfree86-common Package: xfree86-common Status: install ok installed (followed by additional information about the package) If xfree86-common is installed, you can view the Debian X FAQ in a variety of ways, since it is a gzipped (compressed) text file. The path to the FAQ is /usr/share/doc/xfree86-common/FAQ.gz. Here's one method for viewing it: $ zmore /usr/share/doc/xfree86-common/FAQ.gz Debian X Window System Frequently Asked Questions (FAQ) List Copyright 1998-2002 Branden Robinson. This document is licensed under the GNU General Public License, version 2 (see /usr/share/common-licenses/GPL). By its nature, this document is not complete. If your question is not answered here, try /usr/share/doc/packagename/README.Debian (and other files in the package's doc directory), manual pages, and the debian-user mailing list. See http://www.debian.org/ for more information about the Debian mailing lists. (followed by the rest of the FAQ) If the FAQ does not satisfactorily answer your question, the primary Debian users' support forum is the debian-user mailing list. You can learn more about this list at: http://lists.debian.org/debian-user/ If you have already tried that mailing list, and/or your machine does *NOT* use an Intel-x86 compatible CPU (such as a Pentium or AMD Athlon chip), you may also want to peruse one of Debian's architecture-specific mailing lists: http://lists.debian.org/debian-alpha/ http://lists.debian.org/debian-arm/ http://lists.debian.org/debian-hppa/ http://lists.debian.org/debian-ia64/ http://lists.debian.org/debian-m68k/ http://lists.debian.org/debian-mips/ http://lists.debian.org/debian-powerpc/ http://lists.debian.org/debian-sparc/ http://lists.debian.org/debian-superh/ Before sending a message to one of the mailing lists, it's wise to try using the search interface; in many cases, your problem has been experienced before by other people, and a solution, workaround, or explanation may already be available! http://lists.debian.org/search.html If the search engine turns up nothing, you should know whether or not you're subscribed to a mailing list before sending a message to it. If you are not subscribed, make *certain* that you ask for private copies of replies to your message. Debian's standard practice is to reply only to mailing lists (this cuts down on Internet traffic and annoying bounce messages). If you want people to deviate from this standard practice you should ask them to do so. (Advanced mail users should set a Mail-Followup-To header that includes both the list address and their own address.)
X Strike Force XFree86 SVN commit: rev 904 - branches/4.3.0/sid/debian/patches
Author: branden Date: 2004-01-12 17:14:35 -0500 (Mon, 12 Jan 2004) New Revision: 904 Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff Log: Remove redundant annotation of a patch. Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff === --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 22:01:26 UTC (rev 903) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 22:14:35 UTC (rev 904) @@ -6,7 +6,6 @@ * Fix segfaults in rendition and trident drivers. * Drivers shouldn't have to care about recolouring ARGB cursors. * Fix Xv regression in trident driver. - * Add '#define rate period', in line with a kernel change. xc/programs/Xserver/hw/xfree86/loader/elfloader.c @ 1.52,1.55 1.52: Bug # 195: Add support for 2 new relocations types which have been
X Strike Force XFree86 SVN commit: rev 900 - branches/4.3.0/sid/debian/patches
Author: branden Date: 2004-01-12 16:44:58 -0500 (Mon, 12 Jan 2004) New Revision: 900 Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff Log: Improve annotation for Xi deadlock patch. Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff === --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 21:33:00 UTC (rev 899) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 21:44:58 UTC (rev 900) @@ -14,9 +14,9 @@ 1.55: 229. Fix bug in original patch which added support for two new relocation types for IA64 (Bugzilla #195, John Dennis). -(xc/lib/Xi/XExtInt.c, - xc/lib/Xi/XGetVers.c, - xc/lib/Xi/XIint.h): +xc/lib/Xi/XExtInt.c @ 3.8 +xc/lib/Xi/XGetVers.c @ 3.5 +xc/lib/Xi/XIint.h @ 3.2 282. Fixing deadlock in libXi - when is called _XLockDisplay() twice - when calling a Xi function that calls XGetExtensionVersion() (Bugzilla #260, Bastien Nocera, Owen Taylor).
X Strike Force XFree86 SVN commit: rev 901 - branches/4.3.0/sid/debian/patches
Author: branden Date: 2004-01-12 16:59:23 -0500 (Mon, 12 Jan 2004) New Revision: 901 Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff Log: Improve annotation for keyboard-struct-related build fix against Linux kernel 2.6 headers. Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff === --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 21:44:58 UTC (rev 900) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 21:59:23 UTC (rev 901) @@ -21,8 +21,8 @@ when calling a Xi function that calls XGetExtensionVersion() (Bugzilla #260, Bastien Nocera, Owen Taylor). -(xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c, - xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,): +xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c @ 3.25 +xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c @ 1.3 Build fix when using Linux kernel 2.6 headers. (Marc La France, via Michel Dänzer)
X Strike Force XFree86 SVN commit: rev 898 - branches/4.3.0/sid/debian/patches
Author: branden Date: 2004-01-12 16:29:24 -0500 (Mon, 12 Jan 2004) New Revision: 898 Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff Log: Improve annotation for IA-64 ELF relocation types patch. Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff === --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 20:22:15 UTC (rev 897) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 21:29:24 UTC (rev 898) @@ -6,9 +6,14 @@ * Fix segfaults in rendition and trident drivers. * Drivers shouldn't have to care about recolouring ARGB cursors. * Fix Xv regression in trident driver. - * Implement two missing relocations in the ia64 module loader. * Add '#define rate period', in line with a kernel change. +xc/programs/Xserver/hw/xfree86/loader/elfloader.c + 1.52: Bug # 195: Add support for 2 new relocations types which have been +added for IA64 - John [EMAIL PROTECTED] + 1.55: 229. Fix bug in original patch which added support for two new +relocation types for IA64 (Bugzilla #195, John Dennis). + (xc/lib/Xi/XExtInt.c, xc/lib/Xi/XGetVers.c, xc/lib/Xi/XIint.h):
X Strike Force XFree86 SVN commit: rev 891 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2004-01-12 13:10:48 -0500 (Mon, 12 Jan 2004)
New Revision: 891
Removed:
branches/4.3.0/sid/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
Modified:
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
Log:
Drop patch 011b_recognize_ko_KR.EUC-KR_locale patch in favor of practically
identical change to upstream CVS HEAD. Resync offset in patch
011a_recognize_glibc_2.3.2_locale_names.
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
===
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12
18:09:28 UTC (rev 890)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12
18:10:48 UTC (rev 891)
@@ -21,6 +21,9 @@
Build fix when using Linux kernel 2.6 headers. (Marc La France, via
Michel Dänzer)
+(xc/nls/locale.alias):
+ Add ko_KR.EUC-KR (Jungshik Shin).
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.0 +1100
+++ xc/config/imake/imake.c2003-04-09 01:58:14.0 +1000
@@ -700,3 +703,13 @@
static void
SetKbdRepeat(InputInfoPtr pInfo, char rad)
{
+--- xc/nls/locale.alias18 Dec 2003 04:14:22 - 1.64
xc/nls/locale.alias3 Jan 2004 03:31:00 - 1.65
+@@ -419,6 +419,7 @@
+ ko: ko_KR.eucKR
+ ko_KR:ko_KR.eucKR
+ ko_KR.EUC:ko_KR.eucKR
++ko_KR.EUC-KR: ko_KR.eucKR
+ ko_KR.euc:ko_KR.eucKR
+ ko_KR.euckr: ko_KR.eucKR
+ ko_KR.utf8: ko_KR.UTF-8
Modified:
branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
===
---
branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
2004-01-12 18:09:28 UTC (rev 890)
+++
branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
2004-01-12 18:10:48 UTC (rev 891)
@@ -10,7 +10,7 @@
--- xc/nls/locale.alias~ 2003-12-16 12:58:34.0 -0500
+++ xc/nls/locale.alias2003-12-16 12:59:31.0 -0500
-@@ -884,3 +884,67 @@
+@@ -885,3 +885,67 @@
japan:ja_JP.U90
#endif
Japanese-EUC: ja_JP.eucJP
Deleted:
branches/4.3.0/sid/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
===
--- branches/4.3.0/sid/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
2004-01-12 18:09:28 UTC (rev 890)
+++ branches/4.3.0/sid/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
2004-01-12 18:10:48 UTC (rev 891)
@@ -1,16 +0,0 @@
-$Id$
-
-This patch by Denis Barbier [EMAIL PROTECTED].
-
-Not submitted upstream yet.
-
xc/nls/locale.alias~ 2003-12-24 13:18:49.0 -0500
-+++ xc/nls/locale.alias2003-12-24 13:18:52.0 -0500
-@@ -421,6 +421,7 @@
- ko_KR.EUC:ko_KR.eucKR
- ko_KR.euc:ko_KR.eucKR
- ko_KR.euckr: ko_KR.eucKR
-+ko_KR.EUC-KR: ko_KR.eucKR
- ko_KR.utf8: ko_KR.UTF-8
- kw: kw_GB.ISO8859-1
- kw_GB:kw_GB.ISO8859-1
Re: i830 VT switch broken in 4.3.0-0pre1v5
You should probably let David Dawes know that the fixes that were committed to xf-4_3-branch made things worse, not better. I was going to ask him about that, but I realised that asside the changes in the 000_post430.diff patch, which I suppose are the changes on the 4.3 branch, there is also 000_stolen_from_HEAD_i830_driver.diff, which incorporates the patch we had in v4's 056_i810_make_i830_usable.diff but adds some things which sound to me as important, could this be the cause and not the changes in the 000_post430.diff patch? If so I think I should probably build and test 4.3.0-0pre1v5 with 056_i810_make_i830_usable.diff instead of 000_stolen_from_HEAD_i830_driver.diff, what do you think? Regards... -- Manty/BestiaTester - http://manty.net
Re: Patches status: 011-016
On Thu, Jan 08, 2004 at 11:08:25PM -0500, Nathanael Nerode wrote: 011_chinese_locale_fixups - Present upstream on 4.3 branch. There are additional Chinese locale bugfixes (for zh_CN.GB2312) on HEAD, though, which you may want to steal. Those are a bit large; the zh_CN support actually appears to have been largely reworked. Unless someone prepares a clean patch, I will let this wait until XFree86 4.4. 011a_recognize_glibc_2.3.2_locale_names --- Merged (basically unchanged) and present in 4.3 patches (under same name). (Silly name now though, given that it has nothing to do with the new 011) With this many patches it's hard for the numbers to be related to each other very well. As long as the filename is accurately descriptive I'm not too worried. 011b_recognize_ko_KR.EUC-KR_locale -- Unchanged and present in 4.3 patches (under same name). *However*, it's also present in XFree86 HEAD now, so this should be converted to a stolen_from_HEAD patch. Okay, I'll do that. 012_fix_cyrillic_font_aliases - Not upstream, not in 4.3 patches, not irrelevant as far as I can tell. So it needs to be updated for 4.3, which should be pretty straightforward. Also it needs a new number since there's a different 012 in the 4.3 patches. Okay, thanks. 013_wacom_wait_longer_for_input --- Rendered irrelevant by the new 036_wacom_usb_tablet_update patch. (Which, incidentally, is still relevant for 4.3, but is replaced on HEAD by an even newer version.) Okay, good. We'll drop #036 when 4.4 is packaged. 014_document_grab_key_sequences --- Present upstream in 4.3. 015_lbxproxy_segfault_fix - Present upstream in 4.3. Excellent. 016_mga_manpage_updates --- Not upstream, not in 4.3 patches, not irrelevant as far as I can tell. Looks straightforward to update to 4.3 (probably just changed offsets). Okay, I'll work on this. -- G. Branden Robinson| Religion is excellent stuff for Debian GNU/Linux | keeping common people quiet. [EMAIL PROTECTED] | -- Napoleon Bonaparte http://people.debian.org/~branden/ | signature.asc Description: Digital signature
how NOT to steal patches from upstream CVS
$ svn blame xfree86/branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 527branden $Id$ 527branden 5 daniel A few improvements from XFree86 HEAD, including: 5 daniel * Fix overlapping memmove's in imake. 5 daniel * More strict checking of replies (mainly wrt length) in core X11 handling. 5 daniel * Fix segfaults in rendition and trident drivers. 5 daniel * Drivers shouldn't have to care about recolouring ARGB cursors. 240branden * Fix Xv regression in trident driver. 452 daniel * Implement two missing relocations in the ia64 module loader. 758 daniel * Add '#define rate period', in line with a kernel change. 5 daniel [...] The above is very bad. It makes life hard after the next upstream release of XFree86 happens and we need to figure out which things stolen from HEAD we can drop. (Yes, diff is supposed to recognize already-applied patches, but it's not perfect, and it certainly can't be relied upon when changes have been made subsequent to the ones we steal.) We want to be careful about this sort of thing because regressions are bad. Hopefully we all understand why. A different format we find in the same file is better: 648branden (xc/lib/Xi/XExtInt.c, 648branden xc/lib/Xi/XGetVers.c, 648branden xc/lib/Xi/XIint.h): 648branden 282. Fixing deadlock in libXi - when is called _XLockDisplay() twice - 648branden when calling a Xi function that calls XGetExtensionVersion() (Bugzilla 648branden #260, Bastien Nocera, Owen Taylor). 648branden 760branden (xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c, 760branden xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,): 760branden Build fix when using Linux kernel 2.6 headers. (Marc La France, via 760branden Michel Dänzer) 760branden 891branden (xc/nls/locale.alias): 891branden Add ko_KR.EUC-KR (Jungshik Shin). 891branden That's better. We update the patch descriptions in chronological order, identify the files changed, and grab the text of the upstream commit logs, which is particularly handy for grepping a mailbox full of upstream CVS commit mails. We might do better still, and identify the revision of each file from which we're stealing patches. Here's a suggested format: xc/lib/Xi/[EMAIL PROTECTED] xc/lib/Xi/[EMAIL PROTECTED] xc/lib/Xi/[EMAIL PROTECTED] 282. Fixing deadlock in libXi - when is called _XLockDisplay() twice - when calling a Xi function that calls XGetExtensionVersion() (Bugzilla #260, Bastien Nocera, Owen Taylor). Here we use Subversion-style @rev syntax for CVS's abominable per-file revision numbers. Comments? -- G. Branden Robinson|You should try building some of the Debian GNU/Linux |stuff in main that is [EMAIL PROTECTED] |modern...turning on -Wall is like http://people.debian.org/~branden/ |turning on the pain. -- James Troup signature.asc Description: Digital signature
Re: Thoughts on patches in branches/4.3.0/sid
On Fri, Jan 09, 2004 at 01:49:09AM -0500, Nathanael Nerode wrote: These are things I noticed about the *branch* patches (as opposed to the trunk patches). 009_use_xf86config-4_in_xf86config.diff -- This obviously isn't going to go upstream, so shouldn't it be a 900-series patch? Actually, shouldn't it be part of 911_debian_XF86Config_to_XF86Config-4.diff I don't know that it OBVIOUSLY isn't going to go upstream, but yes, it would be harmless enough to move it there. 006_dont_ref_rman.man.diff -- A different variation on this is present upstream in HEAD. Perhaps a stolen_from_HEAD patch is more appropriate? Yes. We should do what upstream does unless we have a very good reason not to. 013_xkb_symbols_euro_support.diff - Appears to have been fixed differently upstream in HEAD. Perhaps stolen_from_HEAD patches are more appropriate? Yes, as above. I've added all of the above to the TODO (for post-4.3.0-1). -- G. Branden Robinson| Debian GNU/Linux | If existence exists, [EMAIL PROTECTED] | why create a creator? http://people.debian.org/~branden/ | signature.asc Description: Digital signature
X Strike Force XFree86 SVN commit: rev 902 - branches/4.3.0/sid/debian/patches
Author: branden Date: 2004-01-12 17:00:17 -0500 (Mon, 12 Jan 2004) New Revision: 902 Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff Log: Improve annotation for ko_KR.EUC-KR locale alias patch. Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff === --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 21:59:23 UTC (rev 901) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 22:00:17 UTC (rev 902) @@ -26,7 +26,7 @@ Build fix when using Linux kernel 2.6 headers. (Marc La France, via Michel Dänzer) -(xc/nls/locale.alias): +xc/nls/locale.alias @ 1.65 Add ko_KR.EUC-KR (Jungshik Shin). diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
Re: Patches status: more stolen_from_HEAD
On Fri, Jan 09, 2004 at 01:23:11AM -0500, Nathanael Nerode wrote: Every patch contained in the following was already in HEAD before 4.3.0 was tagged, and is therefore contained in upstream 4.3.0. :-) (Although in some cases it was very close, being in fact the last change before 4.3.0 branched!) 000_stolen_from_HEAD_ati_driver.diff 000_stolen_from_HEAD_cyrix_driver.diff 000_stolen_from_HEAD_neomagic_driver.diff 000_stolen_from_HEAD_newport_driver.diff 000_stolen_from_HEAD_nv_driver.diff 000_stolen_from_HEAD_savage_driver.diff Wonderful. Thank you again. (This is refering to the patches on the trunk. In some cases there are stolen_from_HEAD patches on the 4.3 branch which have the same names and entirely different contents.) Yup, that's exactly what you should be referring to. :) -- G. Branden Robinson|Fair use is irrelevant and Debian GNU/Linux |improper. [EMAIL PROTECTED] |-- Asst. U.S. Attorney Scott http://people.debian.org/~branden/ |Frewing, explaining the DMCA signature.asc Description: Digital signature
