Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Monday 22 September 2003 06:40 am, Michel Dänzer wrote: > > The only reason it cannot be relied upon is because XFree doesn't ship > > the .pc files required to take advantage of it. Pkg-config requires the > > .pc files to be installed to use it. This patch fills that gap. Current > > autoconf tests are based on heuristics instead of actual data supplied by > > these .pc files. > > As David pointed out, shipping them now won't magically make them appear > in all X11 installtions past and present, so they can't be relied upon. This is not a reason not to support them in the future. wt -- Warren Turkal President, GOLUM, Inc. http://www.golum.org
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Monday 22 September 2003 06:40 am, Michel Dänzer wrote: > > The only reason it cannot be relied upon is because XFree doesn't ship > > the .pc files required to take advantage of it. Pkg-config requires the > > .pc files to be installed to use it. This patch fills that gap. Current > > autoconf tests are based on heuristics instead of actual data supplied by > > these .pc files. > > As David pointed out, shipping them now won't magically make them appear > in all X11 installtions past and present, so they can't be relied upon. This is not a reason not to support them in the future. wt -- Warren Turkal President, GOLUM, Inc. http://www.golum.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
Branden Robinson wrote: > On Mon, Sep 22, 2003 at 01:40:37PM +0200, Michel Dänzer wrote: >> On Mon, 2003-09-22 at 13:18, Warren Turkal wrote: >> > On Monday 22 September 2003 05:54 am, Michel Dänzer wrote: >> > > On Mon, 2003-09-22 at 04:11, Warren Turkal wrote: >> > > In the meantime, David Dawes convinced me that this isn't very useful >> > > for the traditional X libraries because pkg-config support for them >> > > can't be relied upon anyway. >> > >> > The only reason it cannot be relied upon is because XFree doesn't ship >> > the .pc files required to take advantage of it. Pkg-config requires the >> > .pc files to >> > be installed to use it. This patch fills that gap. Current autoconf >> > tests are based on heuristics instead of actual data supplied by these >> > .pc files. >> >> As David pointed out, shipping them now won't magically make them appear >> in all X11 installtions past and present, so they can't be relied upon. > > Warren, I'm going to migrate this pkg-config work over to people/wt for > you. > > I don't feel I have a complete understanding of the political *and* > technical ramifications of this change yet, and until I do I don't want > to risk it causing problems for the 4.3.0-1 deployment. > Still do get rid of the old 017 since it is not needed anymore. Thanks, -- Warren Turkal President, GOLUM, Inc. http://www.golum.org
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
Branden Robinson wrote: > On Mon, Sep 22, 2003 at 01:40:37PM +0200, Michel Dänzer wrote: >> On Mon, 2003-09-22 at 13:18, Warren Turkal wrote: >> > On Monday 22 September 2003 05:54 am, Michel Dänzer wrote: >> > > On Mon, 2003-09-22 at 04:11, Warren Turkal wrote: >> > > In the meantime, David Dawes convinced me that this isn't very useful >> > > for the traditional X libraries because pkg-config support for them >> > > can't be relied upon anyway. >> > >> > The only reason it cannot be relied upon is because XFree doesn't ship >> > the .pc files required to take advantage of it. Pkg-config requires the >> > .pc files to >> > be installed to use it. This patch fills that gap. Current autoconf >> > tests are based on heuristics instead of actual data supplied by these >> > .pc files. >> >> As David pointed out, shipping them now won't magically make them appear >> in all X11 installtions past and present, so they can't be relied upon. > > Warren, I'm going to migrate this pkg-config work over to people/wt for > you. > > I don't feel I have a complete understanding of the political *and* > technical ramifications of this change yet, and until I do I don't want > to risk it causing problems for the 4.3.0-1 deployment. > Still do get rid of the old 017 since it is not needed anymore. Thanks, -- Warren Turkal President, GOLUM, Inc. http://www.golum.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Mon, Sep 22, 2003 at 01:40:37PM +0200, Michel Dänzer wrote: > On Mon, 2003-09-22 at 13:18, Warren Turkal wrote: > > On Monday 22 September 2003 05:54 am, Michel Dänzer wrote: > > > On Mon, 2003-09-22 at 04:11, Warren Turkal wrote: > > > In the meantime, David Dawes convinced me that this isn't very useful > > > for the traditional X libraries because pkg-config support for them > > > can't be relied upon anyway. > > > > The only reason it cannot be relied upon is because XFree doesn't ship the > > .pc > > files required to take advantage of it. Pkg-config requires the .pc files > > to > > be installed to use it. This patch fills that gap. Current autoconf tests > > are based on heuristics instead of actual data supplied by these .pc files. > > As David pointed out, shipping them now won't magically make them appear > in all X11 installtions past and present, so they can't be relied upon. Warren, I'm going to migrate this pkg-config work over to people/wt for you. I don't feel I have a complete understanding of the political *and* technical ramifications of this change yet, and until I do I don't want to risk it causing problems for the 4.3.0-1 deployment. -- G. Branden Robinson|Humor is a rubber sword - it allows Debian GNU/Linux |you to make a point without drawing [EMAIL PROTECTED] |blood. http://people.debian.org/~branden/ |-- Mary Hirsch signature.asc Description: Digital signature
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Mon, Sep 22, 2003 at 01:40:37PM +0200, Michel Dänzer wrote: > On Mon, 2003-09-22 at 13:18, Warren Turkal wrote: > > On Monday 22 September 2003 05:54 am, Michel Dänzer wrote: > > > On Mon, 2003-09-22 at 04:11, Warren Turkal wrote: > > > In the meantime, David Dawes convinced me that this isn't very useful > > > for the traditional X libraries because pkg-config support for them > > > can't be relied upon anyway. > > > > The only reason it cannot be relied upon is because XFree doesn't ship the .pc > > files required to take advantage of it. Pkg-config requires the .pc files to > > be installed to use it. This patch fills that gap. Current autoconf tests > > are based on heuristics instead of actual data supplied by these .pc files. > > As David pointed out, shipping them now won't magically make them appear > in all X11 installtions past and present, so they can't be relied upon. Warren, I'm going to migrate this pkg-config work over to people/wt for you. I don't feel I have a complete understanding of the political *and* technical ramifications of this change yet, and until I do I don't want to risk it causing problems for the 4.3.0-1 deployment. -- G. Branden Robinson|Humor is a rubber sword - it allows Debian GNU/Linux |you to make a point without drawing [EMAIL PROTECTED] |blood. http://people.debian.org/~branden/ |-- Mary Hirsch signature.asc Description: Digital signature
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Mon, 2003-09-22 at 13:18, Warren Turkal wrote: > On Monday 22 September 2003 05:54 am, Michel Dänzer wrote: > > On Mon, 2003-09-22 at 04:11, Warren Turkal wrote: > > In the meantime, David Dawes convinced me that this isn't very useful > > for the traditional X libraries because pkg-config support for them > > can't be relied upon anyway. > > The only reason it cannot be relied upon is because XFree doesn't ship the > .pc > files required to take advantage of it. Pkg-config requires the .pc files to > be installed to use it. This patch fills that gap. Current autoconf tests > are based on heuristics instead of actual data supplied by these .pc files. As David pointed out, shipping them now won't magically make them appear in all X11 installtions past and present, so they can't be relied upon. -- Earthling Michel Dänzer \ Debian (powerpc), XFree86 and DRI developer Software libre enthusiast \ http://svcs.affero.net/rm.php?r=daenzer
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Monday 22 September 2003 05:54 am, Michel Dänzer wrote: > On Mon, 2003-09-22 at 04:11, Warren Turkal wrote: > In the meantime, David Dawes convinced me that this isn't very useful > for the traditional X libraries because pkg-config support for them > can't be relied upon anyway. The only reason it cannot be relied upon is because XFree doesn't ship the .pc files required to take advantage of it. Pkg-config requires the .pc files to be installed to use it. This patch fills that gap. Current autoconf tests are based on heuristics instead of actual data supplied by these .pc files. > I'm not a native English speaker, but none of the definitions of > gratuitousness I've seen mention quantity. I'll gladly take a pointer to > the real definition though. You are correct...my mistake. > My concern is that this could be considered sneaking it in through the > back door. There is no sneaking around. If people use it, they do. I know I will. I am not forcing anyone to do so. I am just adding functionality, that I think will be beneficial, to what is already there. > That being said, if the majority of the XSF thinks that the pros of this > change outweigh the cons, then that's fine with me, and I'll shut up. :) I am in favor of it mainly because of the pkg-config makes it very easy to discover the location of arbitrary libs (so long as they have .pc files installed). wt -- Warren Turkal President, GOLUM, Inc. http://www.golum.org
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Mon, 2003-09-22 at 04:11, Warren Turkal wrote: > Michel Dänzer wrote: > > So do I about the technical change per se, In the meantime, David Dawes convinced me that this isn't very useful for the traditional X libraries because pkg-config support for them can't be relied upon anyway. > > my concern is to avoid gratuitous deviation from upstream. > > It is not gratuitous...it's one file. I'm not a native English speaker, but none of the definitions of gratuitousness I've seen mention quantity. I'll gladly take a pointer to the real definition though. > If using pkg-config to locate xlibs becomes more prevalent, hopefully > upstream will be more friendly toward the change there. My concern is that this could be considered sneaking it in through the back door. That being said, if the majority of the XSF thinks that the pros of this change outweigh the cons, then that's fine with me, and I'll shut up. :) -- Earthling Michel Dänzer \ Debian (powerpc), XFree86 and DRI developer Software libre enthusiast \ http://svcs.affero.net/rm.php?r=daenzer
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Mon, 2003-09-22 at 13:18, Warren Turkal wrote: > On Monday 22 September 2003 05:54 am, Michel Dänzer wrote: > > On Mon, 2003-09-22 at 04:11, Warren Turkal wrote: > > In the meantime, David Dawes convinced me that this isn't very useful > > for the traditional X libraries because pkg-config support for them > > can't be relied upon anyway. > > The only reason it cannot be relied upon is because XFree doesn't ship the .pc > files required to take advantage of it. Pkg-config requires the .pc files to > be installed to use it. This patch fills that gap. Current autoconf tests > are based on heuristics instead of actual data supplied by these .pc files. As David pointed out, shipping them now won't magically make them appear in all X11 installtions past and present, so they can't be relied upon. -- Earthling Michel Dänzer \ Debian (powerpc), XFree86 and DRI developer Software libre enthusiast \ http://svcs.affero.net/rm.php?r=daenzer -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Monday 22 September 2003 05:54 am, Michel Dänzer wrote: > On Mon, 2003-09-22 at 04:11, Warren Turkal wrote: > In the meantime, David Dawes convinced me that this isn't very useful > for the traditional X libraries because pkg-config support for them > can't be relied upon anyway. The only reason it cannot be relied upon is because XFree doesn't ship the .pc files required to take advantage of it. Pkg-config requires the .pc files to be installed to use it. This patch fills that gap. Current autoconf tests are based on heuristics instead of actual data supplied by these .pc files. > I'm not a native English speaker, but none of the definitions of > gratuitousness I've seen mention quantity. I'll gladly take a pointer to > the real definition though. You are correct...my mistake. > My concern is that this could be considered sneaking it in through the > back door. There is no sneaking around. If people use it, they do. I know I will. I am not forcing anyone to do so. I am just adding functionality, that I think will be beneficial, to what is already there. > That being said, if the majority of the XSF thinks that the pros of this > change outweigh the cons, then that's fine with me, and I'll shut up. :) I am in favor of it mainly because of the pkg-config makes it very easy to discover the location of arbitrary libs (so long as they have .pc files installed). wt -- Warren Turkal President, GOLUM, Inc. http://www.golum.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Mon, 2003-09-22 at 04:11, Warren Turkal wrote: > Michel Dänzer wrote: > > So do I about the technical change per se, In the meantime, David Dawes convinced me that this isn't very useful for the traditional X libraries because pkg-config support for them can't be relied upon anyway. > > my concern is to avoid gratuitous deviation from upstream. > > It is not gratuitous...it's one file. I'm not a native English speaker, but none of the definitions of gratuitousness I've seen mention quantity. I'll gladly take a pointer to the real definition though. > If using pkg-config to locate xlibs becomes more prevalent, hopefully > upstream will be more friendly toward the change there. My concern is that this could be considered sneaking it in through the back door. That being said, if the majority of the XSF thinks that the pros of this change outweigh the cons, then that's fine with me, and I'll shut up. :) -- Earthling Michel Dänzer \ Debian (powerpc), XFree86 and DRI developer Software libre enthusiast \ http://svcs.affero.net/rm.php?r=daenzer -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Fri, Sep 19, 2003 at 01:36:38PM -0500, X Strike Force SVN Admin wrote: > Author: wt > Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003) > New Revision: 555 > > Added: >branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff > Removed: >branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff > Modified: >branches/4.3.0/sid/debian/MANIFEST.i386 >branches/4.3.0/sid/debian/rules >branches/4.3.0/sid/debian/xlibs-dev.install > Log: > Enabling pkg-config for libX11. The main artifact is that > there is now a file called /usr/lib/pkgconfig/X11.pc. I have noticed another defect with this changeset. You did not write a debian/changelog entry for it. I'll take care of it. -- G. Branden Robinson| One doesn't have a sense of humor. Debian GNU/Linux | It has you. [EMAIL PROTECTED] | -- Larry Gelbart http://people.debian.org/~branden/ | signature.asc Description: Digital signature
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Fri, Sep 19, 2003 at 01:36:38PM -0500, X Strike Force SVN Admin wrote: > Author: wt > Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003) > New Revision: 555 > > Added: >branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff > Removed: >branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff > Modified: >branches/4.3.0/sid/debian/MANIFEST.i386 >branches/4.3.0/sid/debian/rules >branches/4.3.0/sid/debian/xlibs-dev.install > Log: > Enabling pkg-config for libX11. The main artifact is that > there is now a file called /usr/lib/pkgconfig/X11.pc. I have noticed another defect with this changeset. You did not write a debian/changelog entry for it. I'll take care of it. -- G. Branden Robinson| One doesn't have a sense of humor. Debian GNU/Linux | It has you. [EMAIL PROTECTED] | -- Larry Gelbart http://people.debian.org/~branden/ | signature.asc Description: Digital signature
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
Michel Dänzer wrote: > So do I about the technical change per se, my concern is to avoid > gratuitous deviation from upstream. It is not gratuitous...it's one file. If using pkg-config to locate xlibs becomes more prevalent, hopefully upstream will be more friendly toward the change there. Warren -- Warren Turkal President, GOLUM, Inc. http://www.golum.org
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
Michel Dänzer wrote: > So do I about the technical change per se, my concern is to avoid > gratuitous deviation from upstream. It is not gratuitous...it's one file. If using pkg-config to locate xlibs becomes more prevalent, hopefully upstream will be more friendly toward the change there. Warren -- Warren Turkal President, GOLUM, Inc. http://www.golum.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Sun, 2003-09-21 at 19:59, Branden Robinson wrote: > > Michel, does that explanation satisfy you? I find myself pretty neutral > about this change. So do I about the technical change per se, my concern is to avoid gratuitous deviation from upstream. -- Earthling Michel Dänzer \ Debian (powerpc), XFree86 and DRI developer Software libre enthusiast \ http://svcs.affero.net/rm.php?r=daenzer
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Sun, 2003-09-21 at 19:59, Branden Robinson wrote: > > Michel, does that explanation satisfy you? I find myself pretty neutral > about this change. So do I about the technical change per se, my concern is to avoid gratuitous deviation from upstream. -- Earthling Michel Dänzer \ Debian (powerpc), XFree86 and DRI developer Software libre enthusiast \ http://svcs.affero.net/rm.php?r=daenzer -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Sun, Sep 21, 2003 at 06:13:00AM -0500, Warren Turkal wrote: > Branden Robinson wrote: > > Warren, please expand on your rationale for this change. > > > > The 017 that was in the svn was not useful to any architecture and was > baggage from prior X versions AFAICT since there is already a "depend::" in > the Imakefile in the xc/lib/X11 dir. > > The 017 that was added simply adds pkg-config support for X11. This change > in no way affects the executables or libs. I think this change will be > useful to software developers. I also know that it will be helpful to my > effort at autotoolizing the X programs. Without this support for pkg-config > in place, I am unable to easily detect the location of libs such as Xrender > and set an arbitrary define via autoconf methods. With the pkg-config > support, I am supposed able to even keep portability with Cygwin relatively > easily. This is related to the xrender.pc, xcursor.pc, etc. Also, I really > do not have enough knowledge to build a fully independent autotooled libX11 > at this point as has been done with xcursor, xrender, and xft. > > Although I am working on repackaging libX11 with autotools, it is not done > yet. Also, it is not trivial to make the XFree86 build system use an > external libX11 even if I did. Thus, adding the X11.pc to the current build > system makes a lot of sense to me at this point. Michel, does that explanation satisfy you? I find myself pretty neutral about this change. -- G. Branden Robinson|I just wanted to see what it looked Debian GNU/Linux |like in a spotlight. [EMAIL PROTECTED] |-- Jim Morrison http://people.debian.org/~branden/ | signature.asc Description: Digital signature
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Sun, Sep 21, 2003 at 06:13:00AM -0500, Warren Turkal wrote: > Branden Robinson wrote: > > Warren, please expand on your rationale for this change. > > > > The 017 that was in the svn was not useful to any architecture and was > baggage from prior X versions AFAICT since there is already a "depend::" in > the Imakefile in the xc/lib/X11 dir. > > The 017 that was added simply adds pkg-config support for X11. This change > in no way affects the executables or libs. I think this change will be > useful to software developers. I also know that it will be helpful to my > effort at autotoolizing the X programs. Without this support for pkg-config > in place, I am unable to easily detect the location of libs such as Xrender > and set an arbitrary define via autoconf methods. With the pkg-config > support, I am supposed able to even keep portability with Cygwin relatively > easily. This is related to the xrender.pc, xcursor.pc, etc. Also, I really > do not have enough knowledge to build a fully independent autotooled libX11 > at this point as has been done with xcursor, xrender, and xft. > > Although I am working on repackaging libX11 with autotools, it is not done > yet. Also, it is not trivial to make the XFree86 build system use an > external libX11 even if I did. Thus, adding the X11.pc to the current build > system makes a lot of sense to me at this point. Michel, does that explanation satisfy you? I find myself pretty neutral about this change. -- G. Branden Robinson|I just wanted to see what it looked Debian GNU/Linux |like in a spotlight. [EMAIL PROTECTED] |-- Jim Morrison http://people.debian.org/~branden/ | signature.asc Description: Digital signature
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
Branden Robinson wrote: > On Sat, Sep 20, 2003 at 02:17:40PM +0200, Michel Dänzer wrote: >> On Fri, 2003-09-19 at 20:36, X Strike Force SVN Admin wrote: >> > >> > Log: >> > Enabling pkg-config for libX11. The main artifact is that >> > there is now a file called /usr/lib/pkgconfig/X11.pc. >> >> Shouldn't we wait for an upstream decision on this? > > Warren, please expand on your rationale for this change. > The 017 that was in the svn was not useful to any architecture and was baggage from prior X versions AFAICT since there is already a "depend::" in the Imakefile in the xc/lib/X11 dir. The 017 that was added simply adds pkg-config support for X11. This change in no way affects the executables or libs. I think this change will be useful to software developers. I also know that it will be helpful to my effort at autotoolizing the X programs. Without this support for pkg-config in place, I am unable to easily detect the location of libs such as Xrender and set an arbitrary define via autoconf methods. With the pkg-config support, I am supposed able to even keep portability with Cygwin relatively easily. This is related to the xrender.pc, xcursor.pc, etc. Also, I really do not have enough knowledge to build a fully independent autotooled libX11 at this point as has been done with xcursor, xrender, and xft. Although I am working on repackaging libX11 with autotools, it is not done yet. Also, it is not trivial to make the XFree86 build system use an external libX11 even if I did. Thus, adding the X11.pc to the current build system makes a lot of sense to me at this point. wt -- President, GOLUM, Inc. http://www.golum.org
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
Branden Robinson wrote: > On Fri, Sep 19, 2003 at 01:36:38PM -0500, X Strike Force SVN Admin wrote: >> Author: wt >> Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003) >> New Revision: 555 >> >> Added: >>branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff >> Removed: >>branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff >> Modified: >>branches/4.3.0/sid/debian/MANIFEST.i386 >>branches/4.3.0/sid/debian/rules >>branches/4.3.0/sid/debian/xlibs-dev.install >> Log: >> Enabling pkg-config for libX11. The main artifact is that >> there is now a file called /usr/lib/pkgconfig/X11.pc. > > This commit was defective, in my opinion. > > In the future, please do not alter a MANIFEST file without altering all > of them, when the change being made is expected to affect all > architectures. If the change affects only some architectures, update > the MANIFEST files exactly as you expect them to change. Okay, I was just under the impression that that should be done by someone on the arch...sorry. > Also, don't use the same patch number for a radical alteration of the > patch's function. It would have been better to delete patch #017 and > add the new patch at the first available number, which is somewhere > around #070, I think. Okay, gotcha. wt -- President, GOLUM, Inc. http://www.golum.org
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
Branden Robinson wrote: > On Sat, Sep 20, 2003 at 02:17:40PM +0200, Michel Dänzer wrote: >> On Fri, 2003-09-19 at 20:36, X Strike Force SVN Admin wrote: >> > >> > Log: >> > Enabling pkg-config for libX11. The main artifact is that >> > there is now a file called /usr/lib/pkgconfig/X11.pc. >> >> Shouldn't we wait for an upstream decision on this? > > Warren, please expand on your rationale for this change. > The 017 that was in the svn was not useful to any architecture and was baggage from prior X versions AFAICT since there is already a "depend::" in the Imakefile in the xc/lib/X11 dir. The 017 that was added simply adds pkg-config support for X11. This change in no way affects the executables or libs. I think this change will be useful to software developers. I also know that it will be helpful to my effort at autotoolizing the X programs. Without this support for pkg-config in place, I am unable to easily detect the location of libs such as Xrender and set an arbitrary define via autoconf methods. With the pkg-config support, I am supposed able to even keep portability with Cygwin relatively easily. This is related to the xrender.pc, xcursor.pc, etc. Also, I really do not have enough knowledge to build a fully independent autotooled libX11 at this point as has been done with xcursor, xrender, and xft. Although I am working on repackaging libX11 with autotools, it is not done yet. Also, it is not trivial to make the XFree86 build system use an external libX11 even if I did. Thus, adding the X11.pc to the current build system makes a lot of sense to me at this point. wt -- President, GOLUM, Inc. http://www.golum.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
Branden Robinson wrote: > On Fri, Sep 19, 2003 at 01:36:38PM -0500, X Strike Force SVN Admin wrote: >> Author: wt >> Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003) >> New Revision: 555 >> >> Added: >>branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff >> Removed: >>branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff >> Modified: >>branches/4.3.0/sid/debian/MANIFEST.i386 >>branches/4.3.0/sid/debian/rules >>branches/4.3.0/sid/debian/xlibs-dev.install >> Log: >> Enabling pkg-config for libX11. The main artifact is that >> there is now a file called /usr/lib/pkgconfig/X11.pc. > > This commit was defective, in my opinion. > > In the future, please do not alter a MANIFEST file without altering all > of them, when the change being made is expected to affect all > architectures. If the change affects only some architectures, update > the MANIFEST files exactly as you expect them to change. Okay, I was just under the impression that that should be done by someone on the arch...sorry. > Also, don't use the same patch number for a radical alteration of the > patch's function. It would have been better to delete patch #017 and > add the new patch at the first available number, which is somewhere > around #070, I think. Okay, gotcha. wt -- President, GOLUM, Inc. http://www.golum.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Sat, Sep 20, 2003 at 02:17:40PM +0200, Michel Dänzer wrote: > On Fri, 2003-09-19 at 20:36, X Strike Force SVN Admin wrote: > > > > Log: > > Enabling pkg-config for libX11. The main artifact is that > > there is now a file called /usr/lib/pkgconfig/X11.pc. > > Shouldn't we wait for an upstream decision on this? Warren, please expand on your rationale for this change. -- G. Branden Robinson| Human beings rarely imagine a god Debian GNU/Linux | that behaves any better than a [EMAIL PROTECTED] | spoiled child. http://people.debian.org/~branden/ | -- Robert Heinlein signature.asc Description: Digital signature
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Fri, Sep 19, 2003 at 01:36:38PM -0500, X Strike Force SVN Admin wrote: > Author: wt > Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003) > New Revision: 555 > > Added: >branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff > Removed: >branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff > Modified: >branches/4.3.0/sid/debian/MANIFEST.i386 >branches/4.3.0/sid/debian/rules >branches/4.3.0/sid/debian/xlibs-dev.install > Log: > Enabling pkg-config for libX11. The main artifact is that > there is now a file called /usr/lib/pkgconfig/X11.pc. This commit was defective, in my opinion. In the future, please do not alter a MANIFEST file without altering all of them, when the change being made is expected to affect all architectures. If the change affects only some architectures, update the MANIFEST files exactly as you expect them to change. Also, don't use the same patch number for a radical alteration of the patch's function. It would have been better to delete patch #017 and add the new patch at the first available number, which is somewhere around #070, I think. -- G. Branden Robinson|Somebody once asked me if I thought Debian GNU/Linux |sex was dirty. I said, "It is if [EMAIL PROTECTED] |you're doing it right." http://people.debian.org/~branden/ |-- Woody Allen signature.asc Description: Digital signature
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Sat, Sep 20, 2003 at 02:17:40PM +0200, Michel Dänzer wrote: > On Fri, 2003-09-19 at 20:36, X Strike Force SVN Admin wrote: > > > > Log: > > Enabling pkg-config for libX11. The main artifact is that > > there is now a file called /usr/lib/pkgconfig/X11.pc. > > Shouldn't we wait for an upstream decision on this? Warren, please expand on your rationale for this change. -- G. Branden Robinson| Human beings rarely imagine a god Debian GNU/Linux | that behaves any better than a [EMAIL PROTECTED] | spoiled child. http://people.debian.org/~branden/ | -- Robert Heinlein signature.asc Description: Digital signature
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Fri, Sep 19, 2003 at 01:36:38PM -0500, X Strike Force SVN Admin wrote: > Author: wt > Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003) > New Revision: 555 > > Added: >branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff > Removed: >branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff > Modified: >branches/4.3.0/sid/debian/MANIFEST.i386 >branches/4.3.0/sid/debian/rules >branches/4.3.0/sid/debian/xlibs-dev.install > Log: > Enabling pkg-config for libX11. The main artifact is that > there is now a file called /usr/lib/pkgconfig/X11.pc. This commit was defective, in my opinion. In the future, please do not alter a MANIFEST file without altering all of them, when the change being made is expected to affect all architectures. If the change affects only some architectures, update the MANIFEST files exactly as you expect them to change. Also, don't use the same patch number for a radical alteration of the patch's function. It would have been better to delete patch #017 and add the new patch at the first available number, which is somewhere around #070, I think. -- G. Branden Robinson|Somebody once asked me if I thought Debian GNU/Linux |sex was dirty. I said, "It is if [EMAIL PROTECTED] |you're doing it right." http://people.debian.org/~branden/ |-- Woody Allen signature.asc Description: Digital signature
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Fri, 2003-09-19 at 20:36, X Strike Force SVN Admin wrote: > > Log: > Enabling pkg-config for libX11. The main artifact is that > there is now a file called /usr/lib/pkgconfig/X11.pc. Shouldn't we wait for an upstream decision on this? -- Earthling Michel Dänzer \ Debian (powerpc), XFree86 and DRI developer Software libre enthusiast \ http://svcs.affero.net/rm.php?r=daenzer
Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
On Fri, 2003-09-19 at 20:36, X Strike Force SVN Admin wrote: > > Log: > Enabling pkg-config for libX11. The main artifact is that > there is now a file called /usr/lib/pkgconfig/X11.pc. Shouldn't we wait for an upstream decision on this? -- Earthling Michel Dänzer \ Debian (powerpc), XFree86 and DRI developer Software libre enthusiast \ http://svcs.affero.net/rm.php?r=daenzer -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
Author: wt
Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003)
New Revision: 555
Added:
branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
Removed:
branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
Modified:
branches/4.3.0/sid/debian/MANIFEST.i386
branches/4.3.0/sid/debian/rules
branches/4.3.0/sid/debian/xlibs-dev.install
Log:
Enabling pkg-config for libX11. The main artifact is that
there is now a file called /usr/lib/pkgconfig/X11.pc.
Modified: branches/4.3.0/sid/debian/MANIFEST.i386
===
--- branches/4.3.0/sid/debian/MANIFEST.i386 2003-09-18 21:37:09 UTC (rev
554)
+++ branches/4.3.0/sid/debian/MANIFEST.i386 2003-09-19 18:36:17 UTC (rev
555)
@@ -6146,6 +6146,7 @@
usr/X11R6/lib/modules/linux/libint10.a
usr/X11R6/lib/modules/v10002d.uc
usr/X11R6/lib/modules/v20002d.uc
+usr/X11R6/lib/pkgconfig/X11.pc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
@@ -7861,6 +7862,7 @@
usr/X11R6/man/man7/Xsecurity.7x
usr/bin/dexconf
usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
usr/sbin/update-fonts-alias
usr/sbin/update-fonts-dir
usr/sbin/update-fonts-scale
Deleted: branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
===
--- branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
2003-09-18 21:37:09 UTC (rev 554)
+++ branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
2003-09-19 18:36:17 UTC (rev 555)
@@ -1,14 +0,0 @@
-$Id$
-
-This patch by Ishikawa MUTSUMI.
-
xc/lib/X11/Imakefile.orig 2003-02-20 11:41:45.0 -0500
-+++ xc/lib/X11/Imakefile 2003-02-20 11:41:48.0 -0500
-@@ -1087,5 +1087,7 @@
- #else
- all::
-
-+depend::
-+
- BuildIncludes($(HEADERS),IncSubdir,..)
- #endif
Added: branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
===
--- branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
2003-09-18 21:37:09 UTC (rev 554)
+++ branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
2003-09-19 18:36:17 UTC (rev 555)
@@ -0,0 +1,56 @@
+diff -r -u3 -N xc/lib/X11/Imakefile
017_x11-pkg-config-enable.diff/xc/lib/X11/Imakefile
+--- xc/lib/X11/Imakefile 2002-11-25 20:31:23.0 -0600
xc/lib/X11/Imakefile 2003-09-18 04:23:45.0 -0500
+@@ -1089,3 +1089,22 @@
+
+ BuildIncludes($(HEADERS),IncSubdir,..)
+ #endif
++
++
++SUBSTVARS=prefix="$(PROJECTROOT)" \
++exec_prefix="$(BINDIR)" \
++libdir="$(USRLIBDIR)" \
++includedir="$(INCROOT)" \
++PACKAGE_VERSION="$(SOXLIBREV)" \
++
++all:: X11.pc
++
++X11.pc: X11.pc.in
++ RemoveFile($@)
++ sh config/config-subst $(SUBSTVARS) < X11.pc.in > $@
++
++InstallNonExecFile(X11.pc,$(USRLIBDIR)/pkgconfig)
++
++clean::
++ RemoveFile(X11.pc)
++
+diff -r -u3 -N xc/lib/X11/X11.pc.in
017_x11-pkg-config-enable.diff/xc/lib/X11/X11.pc.in
+--- xc/lib/X11/X11.pc.in 1969-12-31 18:00:00.0 -0600
xc/lib/X11/X11.pc.in 2003-09-18 04:23:45.0 -0500
+@@ -0,0 +1,11 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
++
++Name: X11
++Description: X11 library
++Version: @PACKAGE_VERSION@
++Requires: fontconfig
++Libs: -L${libdir} -lX11
++Cflags: -I${includedir}
+diff -r -u3 -N xc/lib/X11/config/config-subst
017_x11-pkg-config-enable.diff/xc/lib/X11/config/config-subst
+--- xc/lib/X11/config/config-subst 1969-12-31 18:00:00.0 -0600
xc/lib/X11/config/config-subst 2003-09-18 04:23:45.0 -0500
+@@ -0,0 +1,10 @@
++#!/bin/sh
++script=config-subst.$$
++trap "rm $script" 0
++rm -f $script
++for i in ${1+"$@"}; do
++ var="`echo "$i" | sed 's/=.*$//'`"
++ val="`echo "$i" | sed 's/^[^=]*=//'`"
++ echo "s;@$var@;$val;" >> $script
++done
++sed -f $script
+
Modified: branches/4.3.0/sid/debian/rules
===
--- branches/4.3.0/sid/debian/rules 2003-09-18 21:37:09 UTC (rev 554)
+++ branches/4.3.0/sid/debian/rules 2003-09-19 18:36:17 UTC (rev 555)
@@ -332,6 +332,11 @@
install -m 644 debian/local/xfs.options.5
$(DEBTREEDIR)/usr/share/man/man5
install -m 755 debian/local/xvfb-run $(DEBTREEDIR)/usr/bin
install -m 644 debian/local/xvfb-run.1 $(DEBTREEDIR)/usr/share/man/man1
+
+ install -m 755 -d $(DEBTREEDIR)/usr/lib/pkgconfig
+ install -m 644 $(DEBTREEDIR)/usr/X11R6/lib/pkgconfig/X11.pc \
+ $(DEBTREEDIR)/usr/lib/pkgconfig/X11.pc
+
# compare manifests
(cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) >
debian/MANIFEST.$(ARCH).new
# confirm that the installed file list has not changed
Modified: branches/4.3.0/sid/debian/xlibs-dev.install
===
--- b
X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches
Author: wt
Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003)
New Revision: 555
Added:
branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
Removed:
branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
Modified:
branches/4.3.0/sid/debian/MANIFEST.i386
branches/4.3.0/sid/debian/rules
branches/4.3.0/sid/debian/xlibs-dev.install
Log:
Enabling pkg-config for libX11. The main artifact is that
there is now a file called /usr/lib/pkgconfig/X11.pc.
Modified: branches/4.3.0/sid/debian/MANIFEST.i386
===
--- branches/4.3.0/sid/debian/MANIFEST.i386 2003-09-18 21:37:09 UTC (rev 554)
+++ branches/4.3.0/sid/debian/MANIFEST.i386 2003-09-19 18:36:17 UTC (rev 555)
@@ -6146,6 +6146,7 @@
usr/X11R6/lib/modules/linux/libint10.a
usr/X11R6/lib/modules/v10002d.uc
usr/X11R6/lib/modules/v20002d.uc
+usr/X11R6/lib/pkgconfig/X11.pc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
@@ -7861,6 +7862,7 @@
usr/X11R6/man/man7/Xsecurity.7x
usr/bin/dexconf
usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
usr/sbin/update-fonts-alias
usr/sbin/update-fonts-dir
usr/sbin/update-fonts-scale
Deleted: branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
===
--- branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff 2003-09-18
21:37:09 UTC (rev 554)
+++ branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff 2003-09-19
18:36:17 UTC (rev 555)
@@ -1,14 +0,0 @@
-$Id$
-
-This patch by Ishikawa MUTSUMI.
-
xc/lib/X11/Imakefile.orig 2003-02-20 11:41:45.0 -0500
-+++ xc/lib/X11/Imakefile 2003-02-20 11:41:48.0 -0500
-@@ -1087,5 +1087,7 @@
- #else
- all::
-
-+depend::
-+
- BuildIncludes($(HEADERS),IncSubdir,..)
- #endif
Added: branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
===
--- branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff2003-09-18
21:37:09 UTC (rev 554)
+++ branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff2003-09-19
18:36:17 UTC (rev 555)
@@ -0,0 +1,56 @@
+diff -r -u3 -N xc/lib/X11/Imakefile
017_x11-pkg-config-enable.diff/xc/lib/X11/Imakefile
+--- xc/lib/X11/Imakefile 2002-11-25 20:31:23.0 -0600
xc/lib/X11/Imakefile 2003-09-18 04:23:45.0 -0500
+@@ -1089,3 +1089,22 @@
+
+ BuildIncludes($(HEADERS),IncSubdir,..)
+ #endif
++
++
++SUBSTVARS=prefix="$(PROJECTROOT)" \
++exec_prefix="$(BINDIR)" \
++libdir="$(USRLIBDIR)" \
++includedir="$(INCROOT)" \
++PACKAGE_VERSION="$(SOXLIBREV)" \
++
++all:: X11.pc
++
++X11.pc: X11.pc.in
++ RemoveFile($@)
++ sh config/config-subst $(SUBSTVARS) < X11.pc.in > $@
++
++InstallNonExecFile(X11.pc,$(USRLIBDIR)/pkgconfig)
++
++clean::
++ RemoveFile(X11.pc)
++
+diff -r -u3 -N xc/lib/X11/X11.pc.in
017_x11-pkg-config-enable.diff/xc/lib/X11/X11.pc.in
+--- xc/lib/X11/X11.pc.in 1969-12-31 18:00:00.0 -0600
xc/lib/X11/X11.pc.in 2003-09-18 04:23:45.0 -0500
+@@ -0,0 +1,11 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
++
++Name: X11
++Description: X11 library
++Version: @PACKAGE_VERSION@
++Requires: fontconfig
++Libs: -L${libdir} -lX11
++Cflags: -I${includedir}
+diff -r -u3 -N xc/lib/X11/config/config-subst
017_x11-pkg-config-enable.diff/xc/lib/X11/config/config-subst
+--- xc/lib/X11/config/config-subst 1969-12-31 18:00:00.0 -0600
xc/lib/X11/config/config-subst 2003-09-18 04:23:45.0 -0500
+@@ -0,0 +1,10 @@
++#!/bin/sh
++script=config-subst.$$
++trap "rm $script" 0
++rm -f $script
++for i in ${1+"$@"}; do
++ var="`echo "$i" | sed 's/=.*$//'`"
++ val="`echo "$i" | sed 's/^[^=]*=//'`"
++ echo "s;@$var@;$val;" >> $script
++done
++sed -f $script
+
Modified: branches/4.3.0/sid/debian/rules
===
--- branches/4.3.0/sid/debian/rules 2003-09-18 21:37:09 UTC (rev 554)
+++ branches/4.3.0/sid/debian/rules 2003-09-19 18:36:17 UTC (rev 555)
@@ -332,6 +332,11 @@
install -m 644 debian/local/xfs.options.5 $(DEBTREEDIR)/usr/share/man/man5
install -m 755 debian/local/xvfb-run $(DEBTREEDIR)/usr/bin
install -m 644 debian/local/xvfb-run.1 $(DEBTREEDIR)/usr/share/man/man1
+
+ install -m 755 -d $(DEBTREEDIR)/usr/lib/pkgconfig
+ install -m 644 $(DEBTREEDIR)/usr/X11R6/lib/pkgconfig/X11.pc \
+ $(DEBTREEDIR)/usr/lib/pkgconfig/X11.pc
+
# compare manifests
(cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) >
debian/MANIFEST.$(ARCH).new
# confirm that the installed file list has not changed
Modified: branches/4.3.0/sid/debian/xlibs-dev.install
===
--- bran
