Steve Langasek wrote:
More generally, openmotif needs to be updated to use /usr instead of
/usr/X11R6; this was already a bug because openmotif does not appear to use
imake, and /usr/X11R6 is reserved for packages that are either part of X11R6
or build using imake.
Is that as simple to do as this patch?
The patch for _XGetpwnam is no longer needed because the modular X uses
the original API.
Other than that it's basically a s/X11R6\///. It adds references to
/usr/X11R6 to the configure command because it uses things like
libxp-dev. Are these going to move out of X11R6?
Kris Jurka
diff -c orig/openmotif-2.2.3/debian/libmotif3.files
openmotif-2.2.3/debian/libmotif3.files
*** orig/openmotif-2.2.3/debian/libmotif3.files 2006-04-20 16:44:07.000000000
-0700
--- openmotif-2.2.3/debian/libmotif3.files 2006-04-20 17:02:36.000000000
-0700
***************
*** 1,3 ****
! /usr/X11R6/lib/lib*.so.*
! /usr/X11R6/lib/X11/bindings
! /usr/X11R6/include/X11/bitmaps
--- 1,3 ----
! /usr/lib/lib*.so.*
! /usr/lib/X11/bindings
! /usr/include/X11/bitmaps
diff -c orig/openmotif-2.2.3/debian/libmotif-dev.files
openmotif-2.2.3/debian/libmotif-dev.files
*** orig/openmotif-2.2.3/debian/libmotif-dev.files 2006-04-20
16:44:07.000000000 -0700
--- openmotif-2.2.3/debian/libmotif-dev.files 2006-04-20 17:02:53.000000000
-0700
***************
*** 1,11 ****
! /usr/X11R6/lib/libMrm.a
! /usr/X11R6/lib/libUil.a
! /usr/X11R6/lib/libXm.a
! /usr/X11R6/lib/lib*.so
! /usr/X11R6/include/Xm
! /usr/X11R6/include/Mrm
! /usr/X11R6/include/uil
! /usr/X11R6/bin/uil
! /usr/X11R6/man/man1/uil*
! /usr/X11R6/man/man3
! /usr/X11R6/man/man5
--- 1,11 ----
! /usr/lib/libMrm.a
! /usr/lib/libUil.a
! /usr/lib/libXm.a
! /usr/lib/lib*.so
! /usr/include/Xm
! /usr/include/Mrm
! /usr/include/uil
! /usr/bin/uil
! /usr/man/man1/uil*
! /usr/man/man3
! /usr/man/man5
diff -c orig/openmotif-2.2.3/debian/motif-clients.files
openmotif-2.2.3/debian/motif-clients.files
*** orig/openmotif-2.2.3/debian/motif-clients.files 2006-04-20
16:44:07.000000000 -0700
--- openmotif-2.2.3/debian/motif-clients.files 2006-04-20 17:03:04.000000000
-0700
***************
*** 1,7 ****
/etc/X11/mwm
! /usr/X11R6/bin/mwm
! /usr/X11R6/bin/xmbind
! /usr/X11R6/man/man1/mwm*
! /usr/X11R6/man/man1/xmbind*
! /usr/X11R6/man/man4
! /usr/X11R6/lib/X11/system.mwmrc
--- 1,7 ----
/etc/X11/mwm
! /usr/bin/mwm
! /usr/bin/xmbind
! /usr/man/man1/mwm*
! /usr/man/man1/xmbind*
! /usr/man/man4
! /usr/lib/X11/system.mwmrc
diff -c orig/openmotif-2.2.3/debian/rules openmotif-2.2.3/debian/rules
*** orig/openmotif-2.2.3/debian/rules 2006-04-20 16:44:07.000000000 -0700
--- openmotif-2.2.3/debian/rules 2006-04-20 17:03:29.000000000 -0700
***************
*** 37,44 ****
(cd $(WORK)/$(DIR); set -ex; \
CFLAGS="-g -O2 -fno-strict-aliasing" \
./configure \
! --prefix=/usr/X11R6 \
! --mandir=/usr/X11R6/man; \
make)
# sh $(HERE)/debian/fix-libtool $(WORK); \
# make; \
--- 37,45 ----
(cd $(WORK)/$(DIR); set -ex; \
CFLAGS="-g -O2 -fno-strict-aliasing" \
./configure \
! --prefix=/usr \
! --x-includes=/usr/X11R6/include \
! --x-libraries=/usr/X11R6/lib; \
make)
# sh $(HERE)/debian/fix-libtool $(WORK); \
# make; \
***************
*** 64,79 ****
cd $(WORK)/$(DIR)/$$dir; \
make DESTDIR=$(DEST) install; \
done
! # cp -a $(WORK)/$(DIR)/doc/man $(DEST)/usr/X11R6/man
! # rm -f $(DEST)/usr/X11R6/man/man*/Makefile*
# fixup some minor stuff / take care about menus
mkdir -p debian/tmp/etc/X11/mwm
! mkdir -p debian/tmp/usr/X11R6/lib/X11
# rm -f debian/tmp/etc/X11/system.mwmrc
! rm -f debian/tmp/usr/X11R6/lib/X11/system.mwmrc
! ln -s /etc/X11/mwm/system.mwmrc
debian/tmp/usr/X11R6/lib/X11/system.mwmrc
! cat conf/xmbind.add >>
debian/tmp/usr/X11R6/lib/X11/bindings/xmbind.alias
# splitup packages
dh_movefiles
--- 65,80 ----
cd $(WORK)/$(DIR)/$$dir; \
make DESTDIR=$(DEST) install; \
done
! # cp -a $(WORK)/$(DIR)/doc/man $(DEST)/usr/man
! # rm -f $(DEST)/usr/man/man*/Makefile*
# fixup some minor stuff / take care about menus
mkdir -p debian/tmp/etc/X11/mwm
! mkdir -p debian/tmp/usr/lib/X11
# rm -f debian/tmp/etc/X11/system.mwmrc
! rm -f debian/tmp/usr/lib/X11/system.mwmrc
! ln -s /etc/X11/mwm/system.mwmrc debian/tmp/usr/lib/X11/system.mwmrc
! cat conf/xmbind.add >> debian/tmp/usr/lib/X11/bindings/xmbind.alias
# splitup packages
dh_movefiles
***************
*** 89,95 ****
# dh_installdocs -p motif-doc dist/[CLR]* \
# work/motif-doc-ps/*
# dh_installmanpages
! dh_installwm -p motif-clients /usr/X11R6/bin/mwm
dh_installmenu
dh_installchangelogs
dh_link
--- 90,96 ----
# dh_installdocs -p motif-doc dist/[CLR]* \
# work/motif-doc-ps/*
# dh_installmanpages
! dh_installwm -p motif-clients /usr/bin/mwm
dh_installmenu
dh_installchangelogs
dh_link
diff -cN orig/openmotif-2.2.3/patches/workaround-_XGetpwnam-API-breakage.patch
openmotif-2.2.3/patches/workaround-_XGetpwnam-API-breakage.patch
*** orig/openmotif-2.2.3/patches/workaround-_XGetpwnam-API-breakage.patch
2006-04-20 16:44:07.000000000 -0700
--- openmotif-2.2.3/patches/workaround-_XGetpwnam-API-breakage.patch
1969-12-31 16:00:00.000000000 -0800
***************
*** 1,42 ****
- --- openMotif-2.2.3/lib/Xm/Xmos.c.orig 2003-08-19 20:38:24.000000000
+0200
- +++ openMotif-2.2.3/lib/Xm/Xmos.c 2004-04-21 11:19:18.000000000 +0200
- @@ -272,7 +272,7 @@
- }
- *destPtr = '\0';
-
- - pwd_value = _XGetpwnam(nameBuf, pwd_buf);
- + pwd_value = _XGetpwnam(nameBuf, pwd_buf, &pwd_value);
- if (pwd_value != NULL)
- {
- userDirLen = strlen(pwd_value->pw_dir);
- @@ -1030,11 +1030,11 @@
- if ((ptr = (char *)getenv("HOME")) == NULL)
- {
- if ((ptr = (char *)getenv(USER_VAR)) != NULL)
- - pwd_value = _XGetpwnam(ptr, pwd_buf);
- + pwd_value = _XGetpwnam(ptr, pwd_buf, &pwd_value);
- else
- {
- uid = getuid();
- - pwd_value = _XGetpwuid(uid, pwd_buf);
- + pwd_value = _XGetpwuid(uid, pwd_buf, &pwd_value);
- }
-
- if (pwd_value != NULL)
- --- openMotif-2.2.3/clients/uil/UilDB.c.orig 2004-04-21 11:20:07.000000000
+0200
- +++ openMotif-2.2.3/clients/uil/UilDB.c 2004-04-21 11:15:45.000000000
+0200
- @@ -911,12 +911,12 @@
- {
- if((ptr = (char *)getenv(USER_VAR)) != NULL)
- {
- - pwd_value = _XGetpwnam(ptr, pwd_buf);
- + pwd_value = _XGetpwnam(ptr, pwd_buf, &pwd_value);
- }
- else
- {
- uid = getuid();
- - pwd_value = _XGetpwuid(uid, pwd_buf);
- + pwd_value = _XGetpwuid(uid, pwd_buf, &pwd_value);
- }
- if (pwd_value != NULL)
- {
--- 0 ----
