[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: X Strike Force SVN commit: rev 209 - branches/4.3.0/sid/debian/patches



On Wed, Jun 18, 2003 at 07:31:54PM -0400, Jack Howarth wrote:
>    Has anyone else noticed that the repository snapshots for
> the 4.3.0-sid branch hasn't been buildable for a few days now?
> Using the xfree86 4.3.0 tarball there and the snapshot
> branches-4.3.0-sid-debian-2003.06.18.tar.gz I get an error...
> 
> make[4]: Entering directory `/home/howarth/debian-xfree86/xfree86-4.3.0/build-tree/xc/lib'
> In file included from ../../config/cf/Imake.tmpl:104,
>                  from Imakefile.c:40:
> ../../config/cf/linux.cf:114: warning: "InstallAppDefFiles" is not defined
> In file included from Imakefile:40,
>                  from ../../config/cf/Imake.tmpl:2155,
>                  from Imakefile.c:40:
> ../../config/cf/Library.tmpl:40: unterminated #ifndef
> ../../config/imake/imake: Exit code 1.
>   Stop.
> make[4]: *** [Xau/Makefile] Error 1
> 
> The last time I had a buildable snapshot from the repository
> for 4.3.0 branch was about June 8th. Before this error arose
> there were also some packaging issues with the manifests not
> being updated yet for the xcursor changes.


On Wed, Jun 18, 2003 at 09:38:31AM -0500, X Strike Force SVN Admin wrote:
> Author: ishikawa
> Date: 2003-06-18 09:38:15 -0500 (Wed, 18 Jun 2003)
> New Revision: 209
> 
> Modified:
>    branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff
> Log:
> cosmetic fix, add missing #endif
> 
> 
> 
> Modified: branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff
> ==============================================================================
> --- branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff	2003-06-17 03:15:40 UTC (rev 208)
> +++ branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff	2003-06-18 14:38:15 UTC (rev 209)
> @@ -36,7 +36,7 @@
>   #ifndef SubdirLibraryRule
>  --- xc/config/cf/Library.tmpl~	2003-06-14 05:23:52.000000000 -0500
>  +++ xc/config/cf/Library.tmpl	2003-06-14 05:33:43.000000000 -0500
> -@@ -37,6 +37,13 @@
> +@@ -37,6 +37,14 @@
>   #define DoExtraLib NO
>   #endif
>   
> @@ -45,6 +45,7 @@
>  +#  define DoPicLib YES
>  +# else
>  +#  define DoPicLib NO
> ++# endif
>  +#endif
>  +
>   #ifndef HasSharedData
> @@ -59,7 +60,7 @@
>   #  define LibraryCplusplusOptions SharedLibraryCplusplusOptions
>   # else
>   #  define LibraryCplusplusOptions DefaultCplusplusOptions
> -@@ -85,14 +92,14 @@
> +@@ -85,14 +93,14 @@
>   
>   #ifndef CplusplusSource
>   # ifndef LibraryCcCmd
> @@ -76,7 +77,7 @@
>   #   define LibraryCCOptions SharedLibraryCCOptions
>   #  else
>   #   define LibraryCCOptions DefaultCCOptions
> -@@ -121,7 +128,7 @@
> +@@ -121,7 +129,7 @@
>   #else
>   # ifndef CrossCompileDir
>   #  ifndef LibraryCplusplusCmd
> @@ -85,7 +86,7 @@
>   #    define LibraryCplusplusCmd SharedLibraryCplusplusCmd
>   #   else
>   #    define LibraryCplusplusCmd CplusplusCmd
> -@@ -129,7 +136,7 @@
> +@@ -129,7 +137,7 @@
>   #  endif
>   # else 
>   #  ifndef CrossLibraryCplusplusCmd
> @@ -94,7 +95,7 @@
>   #    define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(SharedLibraryCplusplusCmd))
>   #   else
>   #    define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(CplusplusCmd))
> -@@ -138,7 +145,7 @@
> +@@ -138,7 +146,7 @@
>   # endif
>   
>   # ifndef LibraryCplusplusOptions
> @@ -103,7 +104,7 @@
>   #   define LibraryCplusplusOptions SharedLibraryCplusplusOptions
>   #  else
>   #   define LibraryCplusplusOptions DefaultCplusplusOptions
> -@@ -202,14 +209,14 @@
> +@@ -202,14 +210,14 @@
>   # define _NormalObjCplusplusCompile(options) $(_NULLCMD_)
>   # define _NormalCleanDir() $(_NULLCMD_)
>   #else
> @@ -120,7 +121,7 @@
>   #   define _NormalObjCompile(options) NormalRelocLibObjCompile(options)
>   #  else
>   #   define _NormalObjCompile(options) NormalLibObjCompile(options)
> -@@ -219,7 +226,7 @@
> +@@ -219,7 +227,7 @@
>   # endif
>   #endif
>   
> @@ -129,7 +130,7 @@
>   # define _SharedObjCompile(options) $(_NULLCMD_)
>   # define _SharedObjCplusplusCompile(options) $(_NULLCMD_)
>   #else
> -@@ -501,6 +508,12 @@
> +@@ -501,6 +509,12 @@
>   InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
>   #   endif
>   #  endif

-- 
Daniel Stone 	     <daniel@raging.dropbear.id.au>             <dstone@kde.org>
KDE: Konquering a desktop near you - http://www.kde.org

Attachment: pgpry1NzY8Mbo.pgp
Description: PGP signature


Reply to: