[Lsb-messages] /var/www/bzr/lsb/4.1/appbat r968: Patch libbat so it builds with latest sdk changes (need unistd.h, sys/select.h)
Stew Benedict
stewb at linux-foundation.org
Fri Feb 8 16:40:50 UTC 2013
------------------------------------------------------------
revno: 968
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: appbat
timestamp: Fri 2013-02-08 11:40:50 -0500
message:
Patch libbat so it builds with latest sdk changes (need unistd.h, sys/select.h)
Drop check for xmkmf from configure, libbat provides what we need
Update BUILDING
added:
patches/libXaw-1.0.7.new-sdk.patch
patches/libXp-1.0.0.new-sdk.patch
modified:
BUILDING
configure
configure.in
entities/package
extras/md5sums
libs/xaw.xml.in
libs/xp.xml.in
rpm/libbat.spec.in
-------------- next part --------------
=== modified file 'BUILDING'
--- a/BUILDING 2011-05-13 20:56:44 +0000
+++ b/BUILDING 2013-02-08 16:40:50 +0000
@@ -21,7 +21,7 @@
certification, these tools may be built with
"make addons" and "make addons-restart".
-As delivered from the CVS tree, the build must first
+As delivered from the BZR tree, the build must first
be localized. Run the Configure script to do this.
When everything has built, you will see a series of
@@ -38,19 +38,21 @@
LSB Build Tools:
-The LSB-provided packages lsbdev-base, lsbdev-cc
-and lsbdev-c++ provide the necessary tools. lsbdev-cc
-provides "lsbcc" and "lsbc++"; the path /opt/lsbdev-cc/bin
+The LSB-provided packages lsb-build-base, lsb-build-cc,
+lsb-build-c++, lsb-build-desktop and lsb-build-qt4
+provide the necessary tools. lsb-build-cc
+provides "lsbcc" and "lsbc++"; the path /opt/lsb/bin
should be added to the search path before building.
-lsbdev-base provides the lsb headers and stub
-libraries, which the build tools will pick up
-automatically. lsbdev-c++ provides an LSB-clean
+lsb-build-base,desktop,qt4 provide the lsb headers
+and stub libraries, which the build tools will pick up
+automatically. lsb-build-c++ provides an LSB-clean
static C++ library and matching headers.
In addition, you will probably want to install
-lsb-build-libbat. This package provides some static
-libraries that are used to build some of the appbat
-applications.
+lsb-build-libbat-X.X (version should match the LSB
+version you are building for). This package provides
+some static libraries and tools that are used to build
+some of the appbat applications.
*******************************************************
=== modified file 'configure'
--- a/configure 2012-06-18 16:18:46 +0000
+++ b/configure 2013-02-08 16:40:50 +0000
@@ -654,7 +654,6 @@
LDFLAGS
CFLAGS
CC
-XMKMF
YFLAGS
YACC
APPBATVERSION
@@ -2071,50 +2070,6 @@
fi
fi
-# Extract the first word of "xmkmf", so it can be a program name with args.
-set dummy xmkmf; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_XMKMF+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$XMKMF"; then
- ac_cv_prog_XMKMF="$XMKMF" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_XMKMF="xmkmf"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_XMKMF" && ac_cv_prog_XMKMF="false"
-fi
-fi
-XMKMF=$ac_cv_prog_XMKMF
-if test -n "$XMKMF"; then
- { $as_echo "$as_me:$LINENO: result: $XMKMF" >&5
-$as_echo "$XMKMF" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$XMKMF" = "false" ; then
- { $as_echo "$as_me:$LINENO: WARNING: no xmkmf program found" >&5
-$as_echo "$as_me: WARNING: no xmkmf program found" >&2;}
- FATAL=1
-fi
-
{ $as_echo "$as_me:$LINENO: checking for ../tools/nALFS/Makefile" >&5
$as_echo_n "checking for ../tools/nALFS/Makefile... " >&6; }
if test "${ac_cv_file____tools_nALFS_Makefile+set}" = set; then
=== modified file 'configure.in'
--- a/configure.in 2012-06-18 16:18:46 +0000
+++ b/configure.in 2013-02-08 16:40:50 +0000
@@ -38,12 +38,6 @@
fi
fi
-AC_CHECK_PROG(XMKMF, xmkmf, xmkmf, false)
-if test "$XMKMF" = "false" ; then
- AC_MSG_WARN(no xmkmf program found)
- FATAL=1
-fi
-
AC_CHECK_FILE(../tools/nALFS/Makefile, true,
AC_MSG_WARN(build tool in ../tools/nALFS not found)
FATAL=1)
=== modified file 'entities/package'
--- a/entities/package 2011-02-18 23:08:45 +0000
+++ b/entities/package 2013-02-08 16:40:50 +0000
@@ -206,6 +206,7 @@
<!ENTITY xp-package "libXp-1.0.0.tar.bz2">
<!ENTITY xp-directory "libXp-1.0.0">
<!ENTITY xp-patch "libXp-1.0.0.patch">
+<!ENTITY xp-sdk-patch "libXp-1.0.0.new-sdk.patch">
<!ENTITY xau-version "1.0.5">
<!ENTITY xau-package "libXau-1.0.5.tar.bz2">
@@ -221,6 +222,7 @@
<!ENTITY xaw-package "libXaw-1.0.7.tar.bz2">
<!ENTITY xaw-directory "libXaw-1.0.7">
<!ENTITY xaw-patch "libXaw-1.0.7.patch">
+<!ENTITY xaw-sdk-patch "libXaw-1.0.7.new-sdk.patch">
<!ENTITY printproto-version "1.0.4">
<!ENTITY printproto-package "printproto-1.0.4.tar.bz2">
=== modified file 'extras/md5sums'
--- a/extras/md5sums 2012-06-11 13:27:59 +0000
+++ b/extras/md5sums 2013-02-08 16:40:50 +0000
@@ -92,3 +92,5 @@
d4a2abfc94282109b220dea11e8315ba libXp-1.0.0.patch
deb216053844465854fa2e9305c3574f xorg-cf-files-1.0.3.patch
cd99995d86fbb9f65dd7408a2ee50209 libXaw-1.0.7.patch
+54bca8fddb4ec013ece8920b4c25c79a libXaw-1.0.7.new-sdk.patch
+e5f8fb6e3fa39f5d4a8071ab4e657263 libXp-1.0.0.new-sdk.patch
=== modified file 'libs/xaw.xml.in'
--- a/libs/xaw.xml.in 2012-06-17 14:30:11 +0000
+++ b/libs/xaw.xml.in 2013-02-08 16:40:50 +0000
@@ -21,6 +21,16 @@
<param>-i &patch_dir;/&xaw-patch;</param>
</patch>
+ <patch>
+ <base>&build_dir;/&xaw-directory;</base>
+ <param>-N</param>
+ <param>-p0</param>
+ <param>-b</param>
+ <param>-z</param>
+ <param>.new-sdk</param>
+ <param>-i &patch_dir;/&xaw-sdk-patch;</param>
+ </patch>
+
<setenv>
<variable>CC</variable>
<value>lsbcc</value>
=== modified file 'libs/xp.xml.in'
--- a/libs/xp.xml.in 2012-06-17 14:30:11 +0000
+++ b/libs/xp.xml.in 2013-02-08 16:40:50 +0000
@@ -21,6 +21,16 @@
<param>-i &patch_dir;/&xp-patch;</param>
</patch>
+ <patch>
+ <base>&build_dir;/&xp-directory;</base>
+ <param>-N</param>
+ <param>-p1</param>
+ <param>-b</param>
+ <param>-z</param>
+ <param>.new-sdk</param>
+ <param>-i &patch_dir;/&xp-sdk-patch;</param>
+ </patch>
+
<setenv>
<variable>CC</variable>
<value>lsbcc</value>
=== added file 'patches/libXaw-1.0.7.new-sdk.patch'
--- a/patches/libXaw-1.0.7.new-sdk.patch 1970-01-01 00:00:00 +0000
+++ b/patches/libXaw-1.0.7.new-sdk.patch 2013-02-08 16:40:50 +0000
@@ -0,0 +1,33 @@
+diff -up ./src/AsciiSrc.c.new-sdk ./src/AsciiSrc.c
+--- ./src/AsciiSrc.c.new-sdk 2013-02-08 06:49:51.102170774 -0500
++++ ./src/AsciiSrc.c 2013-02-08 06:50:30.743170789 -0500
+@@ -38,6 +38,7 @@ in this Software without prior written a
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <X11/IntrinsicP.h>
+diff -up ./src/MultiSrc.c.new-sdk ./src/MultiSrc.c
+--- ./src/MultiSrc.c.new-sdk 2013-02-08 06:47:21.808170711 -0500
++++ ./src/MultiSrc.c 2013-02-08 06:49:05.955170756 -0500
+@@ -60,6 +60,7 @@ in this Software without prior written a
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <X11/IntrinsicP.h>
+diff -up ./src/TextAction.c.new-sdk ./src/TextAction.c
+--- ./src/TextAction.c.new-sdk 2013-02-08 06:43:35.136170615 -0500
++++ ./src/TextAction.c 2013-02-08 06:46:14.522170684 -0500
+@@ -33,6 +33,7 @@ in this Software without prior written a
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <X11/Xos.h> /* for select() and struct timeval */
++#include <sys/select.h>
+ #include <ctype.h>
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
=== added file 'patches/libXp-1.0.0.new-sdk.patch'
--- a/patches/libXp-1.0.0.new-sdk.patch 1970-01-01 00:00:00 +0000
+++ b/patches/libXp-1.0.0.new-sdk.patch 2013-02-08 16:40:50 +0000
@@ -0,0 +1,11 @@
+diff -up libXp-1.0.0/src/XpNotifyPdm.c.new-sdk libXp-1.0.0/src/XpNotifyPdm.c
+--- libXp-1.0.0/src/XpNotifyPdm.c.new-sdk 2013-02-08 06:57:05.741170958 -0500
++++ libXp-1.0.0/src/XpNotifyPdm.c 2013-02-08 06:57:50.156170976 -0500
+@@ -46,6 +46,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <unistd.h>
+ #include <X11/extensions/Print.h>
+ #include <X11/Xlibint.h>
+ #include <X11/Xutil.h>
=== modified file 'rpm/libbat.spec.in'
--- a/rpm/libbat.spec.in 2013-01-31 14:07:03 +0000
+++ b/rpm/libbat.spec.in 2013-02-08 16:40:50 +0000
@@ -1,7 +1,7 @@
Summary: LSB Library Battery
Name: lsb-build-libbat- at APPBATVERSION@
Version: 1.0
-Release: 1
+Release: 2
Vendor: Linux Foundation
Packager: Appbat Team <lsb-appbat at linux-foundation.org>
License: Open Source Compatible
More information about the lsb-messages
mailing list