Credit to @BenBals for starting work on this patch in <https://github.com/NixOS/nixpkgs/pull/86741>.main
Dusk Banks
3 years ago
committed by
ehmry
parent
611e9302f9
commit
0cb5668d65
@ -0,0 +1,94 @@ |
||||
--- a/platforms/unix/config/Makefile.install
|
||||
+++ b/platforms/unix/config/Makefile.install
|
||||
@@ -101,10 +101,10 @@ uninstall-image : getversion
|
||||
|
||||
install-sources :
|
||||
$(MKINSTALLDIRS) $(ROOT)$(imgdir)
|
||||
- $(INSTALL_DATA) $(topdir)/SqueakV$(SQ_MAJOR).sources $(ROOT)$(imgdir)
|
||||
+ $(INSTALL_DATA) $(topdir)/SqueakV$(SQ_SRC_VERSION).sources $(ROOT)$(imgdir)
|
||||
|
||||
uninstall-sources :
|
||||
- @$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_MAJOR).sources
|
||||
+ @$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_SRC_VERSION).sources
|
||||
|
||||
# npsqueak
|
||||
|
||||
--- a/platforms/unix/config/configure.ac
|
||||
+++ b/platforms/unix/config/configure.ac
|
||||
@@ -122,7 +122,7 @@ AC_SUBST(vmpdir)
|
||||
AC_SUBST(vmmcfg)
|
||||
AC_SUBST(blddir)
|
||||
|
||||
-SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}
|
||||
+AS_VAR_SET_IF([SQ_VERSION], [], [SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}])
|
||||
|
||||
AC_DEFINE_UNQUOTED(SQ_VERSION, "${SQ_VERSION}", [Squeak version])
|
||||
|
||||
@@ -131,21 +131,24 @@ AC_SUBST(SQ_MINOR)
|
||||
AC_SUBST(SQ_UPDATE)
|
||||
AC_SUBST(SQ_VERSION)
|
||||
|
||||
+AS_VAR_SET_IF([SQ_SRC_VERSION], [], [SQ_SRC_VERSION=${SQ_MAJOR}])
|
||||
+AC_SUBST(SQ_SRC_VERSION)
|
||||
+
|
||||
#VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE}
|
||||
|
||||
#AC_DEFINE_UNQUOTED(VM_VERSION, "${VM_VERSION}", [VM version])
|
||||
|
||||
-#AC_SUBST(VM_MAJOR)
|
||||
-#AC_SUBST(VM_MINOR)
|
||||
-#AC_SUBST(VM_RELEASE)
|
||||
-#AC_SUBST(VM_VERSION)
|
||||
+AC_SUBST(VM_MAJOR)
|
||||
+AC_SUBST(VM_MINOR)
|
||||
+AC_SUBST(VM_RELEASE)
|
||||
+AC_SUBST(VM_VERSION)
|
||||
|
||||
# libdir contains ${exec_prefix}, so we have to default and expand early
|
||||
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
|
||||
imgdir=`eval echo ${libdir}/squeak`
|
||||
expanded_relative_imgdir=`eval echo lib/squeak/${VM_VERSION}`
|
||||
-plgdir='${imgdir}/`${blddir}/getversion VERSION_TAG`'
|
||||
+plgdir=`eval echo '${imgdir}'/${VM_VERSION}`
|
||||
|
||||
AC_SUBST(imgdir)
|
||||
AC_SUBST(expanded_relative_imgdir)
|
||||
--- a/platforms/unix/config/inisqueak.in
|
||||
+++ b/platforms/unix/config/inisqueak.in
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
MAJOR=@SQ_MAJOR@
|
||||
VERSION=@SQ_VERSION@
|
||||
+SRC_VERSION=@SQ_SRC_VERSION@
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
@@ -77,7 +78,7 @@ if test "$1" != ""; then
|
||||
fi
|
||||
|
||||
SQUEAK=${bindir}/squeak
|
||||
-SOURCES=SqueakV${MAJOR}.sources
|
||||
+SOURCES=SqueakV${SRC_VERSION}.sources
|
||||
IMAGE=squeak.image.gz
|
||||
CHANGES=squeak.changes.gz
|
||||
|
||||
--- a/platforms/unix/config/make.cfg.in
|
||||
+++ b/platforms/unix/config/make.cfg.in
|
||||
@@ -96,6 +96,16 @@ X_INCLUDES= @X_INCLUDES@
|
||||
X_LIBS= @X_LIBS@
|
||||
|
||||
|
||||
+SQ_MAJOR= @SQ_MAJOR@
|
||||
+SQ_MINOR= @SQ_MINOR@
|
||||
+SQ_UPDATE= @SQ_UPDATE@
|
||||
+SQ_VERSION= @SQ_VERSION@
|
||||
+SQ_SRC_VERSION= @SQ_SRC_VERSION@
|
||||
+VM_MAJOR= @VM_MAJOR@
|
||||
+VM_MINOR= @VM_MINOR@
|
||||
+VM_RELEASE= @VM_RELEASE@
|
||||
+VM_VERSION= @VM_VERSION@
|
||||
+
|
||||
INTERP= @INTERP@
|
||||
|
||||
VM_APP_ICONS= @VM_APP_ICONS@
|
||||
@ -0,0 +1,34 @@ |
||||
--- a/platforms/unix/plugins/UnicodePlugin/Makefile.inc
|
||||
+++ b/platforms/unix/plugins/UnicodePlugin/Makefile.inc
|
||||
@@ -1,2 +1,2 @@
|
||||
-XCPPFLAGS= -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include
|
||||
+XCPPFLAGS= [unicode_plugin_cflags]
|
||||
-XLDFLAGS= -lpangocairo-1.0 -lcairo -lpango-1.0 -lgobject-2.0 -lglib-2.0
|
||||
+XLDFLAGS= [unicode_plugin_libs]
|
||||
--- a/platforms/unix/plugins/UnicodePlugin/acinclude.m4
|
||||
+++ b/platforms/unix/plugins/UnicodePlugin/acinclude.m4
|
||||
@@ -2,9 +2,14 @@
|
||||
|
||||
AC_MSG_CHECKING([for PangoCairo libraries])
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
-CPPFLAGS="-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include"
|
||||
+CPPFLAGS=`pkg-config --cflags glib-2.0 pangocairo`
|
||||
AC_TRY_COMPILE([#include <pango/pangocairo.h>],[{}],[
|
||||
AC_MSG_RESULT(yes)
|
||||
+ PKG_CHECK_MODULES([UNICODE_PLUGIN],[glib-2.0 pangocairo])
|
||||
+ AC_SUBST([UNICODE_PLUGIN_CFLAGS])
|
||||
+ AC_SUBST([UNICODE_PLUGIN_LIBS])
|
||||
+ AC_PLUGIN_DEFINE_UNQUOTED([unicode_plugin_cflags],[$UNICODE_PLUGIN_CFLAGS])
|
||||
+ AC_PLUGIN_DEFINE_UNQUOTED([unicode_plugin_libs],[$UNICODE_PLUGIN_LIBS])
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
AC_PLUGIN_DISABLE
|
||||
--- a/platforms/unix/plugins/XDisplayControlPlugin/acinclude.m4
|
||||
+++ b/platforms/unix/plugins/XDisplayControlPlugin/acinclude.m4
|
||||
@@ -1,5 +1,3 @@
|
||||
# Require X11
|
||||
|
||||
-AC_CHECK_LIB(X11,XOpenDisplay,
|
||||
- [AC_PLUGIN_USE_LIB(X11)],
|
||||
- [AC_PLUGIN_DISABLE])
|
||||
+AC_PLUGIN_CHECK_LIB(X11,XOpenDisplay)
|
||||
@ -0,0 +1,40 @@ |
||||
--- a/platforms/unix/config/bin.squeak.sh.in
|
||||
+++ b/platforms/unix/config/bin.squeak.sh.in
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
|
||||
# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
|
||||
-BIN=`/usr/bin/dirname "$0"`/../@expanded_relative_imgdir@
|
||||
+BIN=`dirname "$0"`/../@expanded_relative_imgdir@
|
||||
GDB=
|
||||
if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
|
||||
export SQUEAK_PLUGINS="$BIN"
|
||||
@@ -26,7 +26,7 @@ fi
|
||||
# libc (e.g. through the FFI) then it must use the same version that the VM uses
|
||||
# and so it should take precedence over /lib libc. This is done by setting
|
||||
# LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
|
||||
-LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
|
||||
+LIBC_SO="`@glibc@/bin/ldd "$BIN/squeak" | @gnugrep@/bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
|
||||
PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'`
|
||||
|
||||
if [ "$PLATFORMLIBDIR" = "" ]; then
|
||||
--- a/platforms/unix/config/squeak.sh.in
|
||||
+++ b/platforms/unix/config/squeak.sh.in
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
|
||||
# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
|
||||
-BIN=`/usr/bin/dirname "$0"`/@expanded_relative_imgdir@
|
||||
+BIN=`dirname "$0"`/@expanded_relative_imgdir@
|
||||
GDB=
|
||||
if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
|
||||
export SQUEAK_PLUGINS="$BIN"
|
||||
@@ -26,7 +26,7 @@ fi
|
||||
# libc (e.g. through the FFI) then it must use the same version that the VM uses
|
||||
# and so it should take precedence over /lib libc. This is done by setting
|
||||
# LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
|
||||
-LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
|
||||
+LIBC_SO="`@glibc@/bin/ldd "$BIN/squeak" | @gnugrep@/bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
|
||||
PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'`
|
||||
|
||||
if [ "$PLATFORMLIBDIR" = "" ]; then
|
||||
Loading…
Reference in new issue