diff options
Diffstat (limited to 'packages')
26 files changed, 24981 insertions, 464 deletions
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index 9784d5cd8e..adb4378e20 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Ecore is the Enlightenment application framework library" LICENSE = "MIT BSD" -DEPENDS = "curl eet evas tslib libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor" +DEPENDS = "curl eet evas tslib libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil" # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" PV = "0.9.9.043+svnr${SRCREV}" diff --git a/packages/efl1/ecore_svn.bb b/packages/efl1/ecore_svn.bb index 018a8e7124..3bc51849d2 100644 --- a/packages/efl1/ecore_svn.bb +++ b/packages/efl1/ecore_svn.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r4" +PR = "r5" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl1/edje-sdk_svn.bb b/packages/efl1/edje-sdk_svn.bb new file mode 100644 index 0000000000..de307d7064 --- /dev/null +++ b/packages/efl1/edje-sdk_svn.bb @@ -0,0 +1,9 @@ +require edje_svn.bb + +inherit sdk +PR = "r0" + +SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-sdk', '')}" +DEPENDS = "evas-native ecore-native eet-native embryo-native" +S = "${WORKDIR}/edje" + diff --git a/packages/efl1/edje_svn.bb b/packages/efl1/edje_svn.bb index 664e965dcc..17c8f91024 100644 --- a/packages/efl1/edje_svn.bb +++ b/packages/efl1/edje_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "eet evas ecore embryo edje-native" LICENSE = "MIT BSD" PV = "0.5.0.043+svnr${SRCREV}" -PR = "r4" +PR = "r5" inherit efl @@ -10,6 +10,15 @@ inherit efl EXTRA_OECONF = "--enable-edje-program-cache" PACKAGES =+ "${PN}-utils" +RDEPENDS_${PN}-utils = "cpp cpp-symlinks embryo-tests" + +RRECOMMENDS_${PN}-utils = "\ + libevas-saver-png \ + libevas-saver-jpeg \ + libevas-saver-eet \ + libevas-saver-tiff \ +" + DEBIAN_NOAUTONAME_${PN}-utils = "1" FILES_${PN}-utils = "\ ${bindir}/edje_* \ diff --git a/packages/iotop/iotop_0.2.1.bb b/packages/iotop/iotop_0.2.1.bb new file mode 100644 index 0000000000..5f85f59fe3 --- /dev/null +++ b/packages/iotop/iotop_0.2.1.bb @@ -0,0 +1,14 @@ +HOMEPAGE = "http://guichaz.free.fr/iotop/" +LICENSE = "GPL" +PR = "r2" + +RDEPENDS = "python-distutils python-curses python-setuptools python-textutils" + +SRC_URI = "http://guichaz.free.fr/iotop/files/${PN}-${PV}.tar.bz2" + +inherit distutils + +do_install_append() { + rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/site.pyo + rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/site.py +} diff --git a/packages/prelink/prelink-20061027/prelink.conf b/packages/prelink/files/prelink.conf index c5a4f4adc3..c5a4f4adc3 100644 --- a/packages/prelink/prelink-20061027/prelink.conf +++ b/packages/prelink/files/prelink.conf diff --git a/packages/prelink/prelink-20061027/prelink.cron.daily b/packages/prelink/files/prelink.cron.daily index 0b3c07322c..0b3c07322c 100644 --- a/packages/prelink/prelink-20061027/prelink.cron.daily +++ b/packages/prelink/files/prelink.cron.daily diff --git a/packages/prelink/prelink-20061027/prelink.default b/packages/prelink/files/prelink.default index 901258ed2a..901258ed2a 100644 --- a/packages/prelink/prelink-20061027/prelink.default +++ b/packages/prelink/files/prelink.default diff --git a/packages/prelink/prelink-20071009/arm_eabi.patch b/packages/prelink/prelink-20071009/arm_eabi.patch new file mode 100644 index 0000000000..5656350d4a --- /dev/null +++ b/packages/prelink/prelink-20071009/arm_eabi.patch @@ -0,0 +1,305 @@ +From 7244fbfa85bc874225cd91a797e94bca78697848 Mon Sep 17 00:00:00 2001 +From: Holger Freyther <ich@tamarin.(none)> +Date: Sun, 12 Oct 2008 13:45:14 +0200 +Subject: [PATCH] ARM EABI patch from Openembedded? Taken from where? + +--- + src/arch-arm.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 172 insertions(+), 5 deletions(-) + +diff --git a/src/arch-arm.c b/src/arch-arm.c +index 6641e86..3080b0a 100644 +--- a/src/arch-arm.c ++++ b/src/arch-arm.c +@@ -145,6 +145,26 @@ arm_prelink_rel (struct prelink_info *info, GElf_Rel *rel, GElf_Addr reladdr) + error (0, 0, "%s: R_ARM_PC24 relocs with non-zero addend should not be present in prelinked REL sections", + dso->filename); + return 1; ++ /* DTPOFF32, DTPMOD32 and TPOFF32 is impossible to predict unless prelink ++ sets the rules. Also for DTPOFF32/TPOFF32 there is REL->RELA problem. */ ++ case R_ARM_TLS_DTPOFF32: ++ if (dso->ehdr.e_type == ET_EXEC) ++ error (0, 0, "%s: R_ARM_TLS_DTPOFF32 relocs should not be present in prelinked ET_EXEC REL sections", ++ dso->filename); ++ break; ++ case R_ARM_TLS_DTPMOD32: ++ if (dso->ehdr.e_type == ET_EXEC) ++ { ++ error (0, 0, "%s: R_ARM_TLS_DTPMOD32 reloc in executable?", ++ dso->filename); ++ return 1; ++ } ++ break; ++ case R_ARM_TLS_TPOFF32: ++ if (dso->ehdr.e_type == ET_EXEC) ++ error (0, 0, "%s: R_ARM_TLS_TPOFF32 relocs should not be present in prelinked ET_EXEC REL sections", ++ dso->filename); ++ break; + case R_ARM_COPY: + if (dso->ehdr.e_type == ET_EXEC) + /* COPY relocs are handled specially in generic code. */ +@@ -195,6 +215,25 @@ arm_prelink_rela (struct prelink_info *info, GElf_Rela *rela, + write_le32 (dso, rela->r_offset, + (read_ule32 (dso, rela->r_offset) & 0xff000000) | val); + break; ++ case R_ARM_TLS_DTPOFF32: ++ if (dso->ehdr.e_type == ET_EXEC) ++ write_le32 (dso, rela->r_offset, value + rela->r_addend); ++ break; ++ /* DTPMOD32 and TPOFF32 are impossible to predict unless prelink ++ sets the rules. */ ++ case R_ARM_TLS_DTPMOD32: ++ if (dso->ehdr.e_type == ET_EXEC) ++ { ++ error (0, 0, "%s: R_ARM_TLS_DTPMOD32 reloc in executable?", ++ dso->filename); ++ return 1; ++ } ++ break; ++ case R_ARM_TLS_TPOFF32: ++ if (dso->ehdr.e_type == ET_EXEC && info->resolvetls) ++ write_le32 (dso, rela->r_offset, ++ value + rela->r_addend + info->resolvetls->offset); ++ break; + case R_ARM_COPY: + if (dso->ehdr.e_type == ET_EXEC) + /* COPY relocs are handled specially in generic code. */ +@@ -315,6 +354,7 @@ arm_prelink_conflict_rel (DSO *dso, struct prelink_info *info, GElf_Rel *rel, + { + GElf_Addr value; + struct prelink_conflict *conflict; ++ struct prelink_tls *tls; + GElf_Rela *ret; + + if (GELF_R_TYPE (rel->r_info) == R_ARM_RELATIVE +@@ -324,8 +364,32 @@ arm_prelink_conflict_rel (DSO *dso, struct prelink_info *info, GElf_Rel *rel, + conflict = prelink_conflict (info, GELF_R_SYM (rel->r_info), + GELF_R_TYPE (rel->r_info)); + if (conflict == NULL) +- return 0; +- value = conflict_lookup_value (conflict); ++ { ++ if (info->curtls == NULL) ++ return 0; ++ switch (GELF_R_TYPE (rel->r_info)) ++ { ++ /* Even local DTPMOD and {D,}TPOFF relocs need conflicts. */ ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_TPOFF32: ++ break; ++ default: ++ return 0; ++ } ++ value = 0; ++ } ++ else ++ { ++ /* DTPOFF32 wants to see only real conflicts, not lookups ++ with reloc_class RTYPE_CLASS_TLS. */ ++ if (GELF_R_TYPE (rel->r_info) == R_ARM_TLS_DTPOFF32 ++ && conflict->lookup.tls == conflict->conflict.tls ++ && conflict->lookupval == conflict->conflictval) ++ return 0; ++ ++ value = conflict_lookup_value (conflict); ++ } + ret = prelink_conflict_add_rela (info); + if (ret == NULL) + return 1; +@@ -342,6 +406,33 @@ arm_prelink_conflict_rel (DSO *dso, struct prelink_info *info, GElf_Rel *rel, + error (0, 0, "%s: R_ARM_%s relocs should not be present in prelinked REL sections", + dso->filename, GELF_R_TYPE (rel->r_info) == R_ARM_ABS32 ? "ABS32" : "PC24"); + return 1; ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_TPOFF32: ++ if (conflict != NULL ++ && (conflict->reloc_class != RTYPE_CLASS_TLS ++ || conflict->lookup.tls == NULL)) ++ { ++ error (0, 0, "%s: R_ARM_TLS not resolving to STT_TLS symbol", ++ dso->filename); ++ return 1; ++ } ++ tls = conflict ? conflict->lookup.tls : info->curtls; ++ ret->r_info = GELF_R_INFO (0, R_ARM_ABS32); ++ switch (GELF_R_TYPE (rel->r_info)) ++ { ++ case R_ARM_TLS_DTPMOD32: ++ ret->r_addend = tls->modid; ++ break; ++ case R_ARM_TLS_DTPOFF32: ++ ret->r_addend = value + read_ule32 (dso, rel->r_offset); ++ break; ++ case R_ARM_TLS_TPOFF32: ++ ret->r_addend = value + read_ule32 (dso, rel->r_offset) ++ + tls->offset; ++ break; ++ } ++ break; + case R_ARM_COPY: + error (0, 0, "R_ARM_COPY should not be present in shared libraries"); + return 1; +@@ -359,6 +450,7 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info, + { + GElf_Addr value; + struct prelink_conflict *conflict; ++ struct prelink_tls *tls; + GElf_Rela *ret; + Elf32_Sword val; + +@@ -369,8 +461,32 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info, + conflict = prelink_conflict (info, GELF_R_SYM (rela->r_info), + GELF_R_TYPE (rela->r_info)); + if (conflict == NULL) +- return 0; +- value = conflict_lookup_value (conflict); ++ { ++ if (info->curtls == NULL) ++ return 0; ++ switch (GELF_R_TYPE (rela->r_info)) ++ { ++ /* Even local DTPMOD and {D,}TPOFF relocs need conflicts. */ ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_TPOFF32: ++ break; ++ default: ++ return 0; ++ } ++ value = 0; ++ } ++ else ++ { ++ /* DTPOFF32 wants to see only real conflicts, not lookups ++ with reloc_class RTYPE_CLASS_TLS. */ ++ if (GELF_R_TYPE (rela->r_info) == R_ARM_TLS_DTPOFF32 ++ && conflict->lookup.tls == conflict->conflict.tls ++ && conflict->lookupval == conflict->conflictval) ++ return 0; ++ ++ value = conflict_lookup_value (conflict); ++ } + ret = prelink_conflict_add_rela (info); + if (ret == NULL) + return 1; +@@ -398,6 +514,32 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info, + case R_ARM_COPY: + error (0, 0, "R_ARM_COPY should not be present in shared libraries"); + return 1; ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_TPOFF32: ++ if (conflict != NULL ++ && (conflict->reloc_class != RTYPE_CLASS_TLS ++ || conflict->lookup.tls == NULL)) ++ { ++ error (0, 0, "%s: R_386_TLS not resolving to STT_TLS symbol", ++ dso->filename); ++ return 1; ++ } ++ tls = conflict ? conflict->lookup.tls : info->curtls; ++ ret->r_info = GELF_R_INFO (0, R_ARM_ABS32); ++ switch (GELF_R_TYPE (rela->r_info)) ++ { ++ case R_ARM_TLS_DTPMOD32: ++ ret->r_addend = tls->modid; ++ break; ++ case R_ARM_TLS_DTPOFF32: ++ ret->r_addend = value + rela->r_addend; ++ break; ++ case R_ARM_TLS_TPOFF32: ++ ret->r_addend = value + rela->r_addend + tls->offset; ++ break; ++ } ++ break; + default: + error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, + (int) GELF_R_TYPE (rela->r_info)); +@@ -418,6 +560,8 @@ arm_rel_to_rela (DSO *dso, GElf_Rel *rel, GElf_Rela *rela) + abort (); + case R_ARM_RELATIVE: + case R_ARM_ABS32: ++ case R_ARM_TLS_TPOFF32: ++ case R_ARM_TLS_DTPOFF32: + rela->r_addend = (Elf32_Sword) read_ule32 (dso, rel->r_offset); + break; + case R_ARM_PC24: +@@ -426,6 +570,7 @@ arm_rel_to_rela (DSO *dso, GElf_Rel *rel, GElf_Rela *rela) + break; + case R_ARM_COPY: + case R_ARM_GLOB_DAT: ++ case R_ARM_TLS_DTPMOD32: + rela->r_addend = 0; + break; + } +@@ -445,6 +590,8 @@ arm_rela_to_rel (DSO *dso, GElf_Rela *rela, GElf_Rel *rel) + abort (); + case R_ARM_RELATIVE: + case R_ARM_ABS32: ++ case R_ARM_TLS_TPOFF32: ++ case R_ARM_TLS_DTPOFF32: + write_le32 (dso, rela->r_offset, rela->r_addend); + break; + case R_ARM_PC24: +@@ -453,6 +600,7 @@ arm_rela_to_rel (DSO *dso, GElf_Rela *rela, GElf_Rel *rel) + | ((rela->r_addend >> 2) & 0xffffff)); + break; + case R_ARM_GLOB_DAT: ++ case R_ARM_TLS_DTPMOD32: + write_le32 (dso, rela->r_offset, 0); + break; + } +@@ -488,6 +636,15 @@ arm_need_rel_to_rela (DSO *dso, int first, int last) + /* FALLTHROUGH */ + case R_ARM_PC24: + return 1; ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_TPOFF32: ++ /* In shared libraries {D,}TPOFF32 is changed always into ++ conflicts, for executables we need to preserve ++ original addend. */ ++ if (dso->ehdr.e_type == ET_EXEC) { ++ return 1; ++ } ++ break; + } + } + } +@@ -614,6 +771,12 @@ arm_undo_prelink_rel (DSO *dso, GElf_Rel *rel, GElf_Addr reladdr) + return 0; + error (0, 0, "%s: R_ARM_COPY reloc in shared library?", dso->filename); + return 1; ++ case R_ARM_TLS_DTPMOD32: ++ write_le32 (dso, rel->r_offset, 0); ++ break; ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_TPOFF32: ++ break; + default: + error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, + (int) GELF_R_TYPE (rel->r_info)); +@@ -636,6 +799,10 @@ arm_reloc_class (int reloc_type) + { + case R_ARM_COPY: return RTYPE_CLASS_COPY; + case R_ARM_JUMP_SLOT: return RTYPE_CLASS_PLT; ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_TPOFF32: ++ return RTYPE_CLASS_TLS; + default: return RTYPE_CLASS_VALID; + } + } +@@ -648,7 +815,7 @@ PL_ARCH = { + .R_JMP_SLOT = R_ARM_JUMP_SLOT, + .R_COPY = R_ARM_COPY, + .R_RELATIVE = R_ARM_RELATIVE, +- .dynamic_linker = "/lib/ld-linux.so.2", ++ .dynamic_linker = "/lib/ld-linux.so.3", + .adjust_dyn = arm_adjust_dyn, + .adjust_rel = arm_adjust_rel, + .adjust_rela = arm_adjust_rela, +-- +1.5.4.3 + diff --git a/packages/prelink/prelink_20071009.bb b/packages/prelink/prelink_20071009.bb new file mode 100644 index 0000000000..e93f1f2515 --- /dev/null +++ b/packages/prelink/prelink_20071009.bb @@ -0,0 +1,46 @@ +SECTION = "devel" +DEPENDS = "elfutils" +DESCRIPTION = " The prelink package contains a utility which modifies ELF shared libraries \ +and executables, so that far fewer relocations need to be resolved at \ +runtime and thus programs come up faster." +LICENSE = "GPL" +PR = "r5" + +SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \ + file://prelink.conf \ + file://prelink.cron.daily \ + file://prelink.default" + +TARGET_OS_ORIG := "${TARGET_OS}" +OVERRIDES_append = ":${TARGET_OS_ORIG}" +SRC_URI_append_linux-gnueabi = " file://arm_eabi.patch;patch=1" + +S = "${WORKDIR}/prelink-0.0.${PV}" + +EXTRA_OECONF = "--disable-64bit" + +inherit autotools + +do_install_append () { + install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf + install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink + install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink +} + +pkg_postinst_prelink() { +#!/bin/sh + +if [ "x$D" != "x" ]; then + exit 1 +fi + +prelink -a +} + +pkg_postrm_prelink() { +#!/bin/sh + +prelink -au +} + diff --git a/packages/python/python-pyxdg_0.15.bb b/packages/python/python-pyxdg_0.15.bb new file mode 100644 index 0000000000..d660b8eb87 --- /dev/null +++ b/packages/python/python-pyxdg_0.15.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "PyXDG is a python library to access freedesktop.org standards" +SECTION = "devel/python" +LICENSE = "GPL" + +SRC_URI = "http://www.freedesktop.org/~lanius/pyxdg-${PV}.tar.gz" +S = "${WORKDIR}/pyxdg-${PV}" + +inherit distutils diff --git a/packages/squeak/files/Makefile.in b/packages/squeak/files/Makefile.in deleted file mode 100644 index 9be8c7d2a9..0000000000 --- a/packages/squeak/files/Makefile.in +++ /dev/null @@ -1,84 +0,0 @@ -# Makefile for core VM -*- makefile -*- -# -# Copyright (C) 1996-2002 Ian Piumarta and other authors/contributors -# as listed elsewhere in this file. -# All rights reserved. -# -# This file is part of Unix Squeak. -# -# This file is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. -# -# You may use and/or distribute this file ONLY as part of Squeak, under -# the terms of the Squeak License as described in `LICENSE' in the base of -# this distribution, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment to the original author(s) (and any -# other contributors mentioned herein) in the product documentation -# would be appreciated but is not required. -# -# 2. This notice must not be removed or altered in any source distribution. -# -# Using (or modifying this file for use) in any context other than Squeak -# changes these copyright conditions. Read the file `COPYING' in the -# directory `platforms/unix/doc' before proceeding with any such use. -# -# You are not allowed to distribute a modified version of this file -# under its original name without explicit permission to do so. If -# you change it, rename it. -# -# Author: ian.piumarta@inria.fr -# -# Last edited: 2002-12-01 10:20:57 by piumarta on calvin.inria.fr - -[make_cfg] -[make_plg] - -MOC = $(QTDIR)/bin/moc -OBJS = $(INTERP)$o sqNamedPrims$o sqVirtualMachine$o \ - aio$o osExports$o sqUnixExternalPrims$o sqQPEWindow$o moc_sqQPEWindow$o sqQPEGlue$o -TARGET = ${OBJS} - -XINCLUDES = [includes] -I$(topdir)/platforms/Cross/plugins/FilePlugin -I$(topdir)/platforms/Cross/plugins/JoystickTabletPlugin -XCPPINCLUDES = -I$(QTDIR)/include -CPPFLAGS = -fno-exceptions -DQWS -fno-rtti -fno-exceptions -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED - -TARGET = vm$a - -$(TARGET) : $(OBJS) Makefile - $(LINK) $(TARGET) $(OBJS) - $(RANLIB) $(TARGET) - -# rebuild sqNamedPrims.o if sqNamedPrims.h changes - -sqNamedPrims$o : $(srcdir)/vm/sqNamedPrims.h - -# rebuild sqExtPrims (VM_LIBDIR) sqXWin (VM_VERSION) if config.h changes - -sqUnixExternalPrims$o sqXWindow$o : ../config.h $(topdir)/platforms/unix/vm/dlfcn-dyld.c - -# GNUify the interpreter if needed - -gnu-interp$o : gnu-interp.c - $(COMPILE) $@ gnu-interp.c - -gnu-interp.c : $(srcdir)/vm/interp.c - $(AWK) -f $(topdir)/platforms/unix/config/gnuify $(srcdir)/vm/interp.c > $@.out - mv $@.out $@ - -moc_sqQPEWindow$o: moc_sqQPEWindow.cpp - g++ ${INCLUDES} ${XINCLUDES} ${CFLAGS} ${CPPFLAGS} ${XCPPINCLUDES} -DNON_ZAURUS_ENVIRONMENT -c -o moc_sqQPEWindow$o moc_sqQPEWindow.cpp - -moc_sqQPEWindow.cpp: $(topdir)/platforms/unix/vm/sqQPEWindow.h - $(MOC) $(topdir)/platforms/unix/vm/sqQPEWindow.h -o moc_sqQPEWindow.cpp - -sqQPEWindow$o: $(topdir)/platforms/unix/vm/sqQPEWindow.cpp - g++ ${INCLUDES} ${XINCLUDES} ${CFLAGS} ${CPPFLAGS} ${XCPPINCLUDES} -DNON_ZAURUS_ENVIRONMENT -c -o sqQPEWindow$o $(topdir)/platforms/unix/vm/sqQPEWindow.cpp - - -[make_targets] - -.force : diff --git a/packages/squeak/files/configure-fixes.patch b/packages/squeak/files/configure-fixes.patch new file mode 100644 index 0000000000..9ed78472d4 --- /dev/null +++ b/packages/squeak/files/configure-fixes.patch @@ -0,0 +1,24113 @@ +diff --git a/platforms/unix/config/Makefile.in b/platforms/unix/config/Makefile.in +index e911837..45881bc 100644 +--- a/platforms/unix/config/Makefile.in ++++ b/platforms/unix/config/Makefile.in +@@ -43,12 +43,7 @@ all : $(squeak) plugins squeak.1 $(npsqueak) + # VM + + $(squeak) : config.sh $(SQLIBS) version.o +- $(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a +- @echo +- @size $(squeak) +- @echo +- @./$(squeak) -version +- @echo ++ $(LINK) $(squeak) vm/vm.a $(SQLIBS) version.o $(LIBS) [plibs] + + version.o : version.c + $(COMPILE) version.o version.c +diff --git a/platforms/unix/config/Makefile.install b/platforms/unix/config/Makefile.install +index 447a5f9..ca44bbf 100644 +--- a/platforms/unix/config/Makefile.install ++++ b/platforms/unix/config/Makefile.install +@@ -16,102 +16,102 @@ uninstall : uninstall-squeak uninstall-plugins uninstall-doc $(uninstall_nps) + # squeak + + install-squeak : $(squeak) +- $(MKINSTALLDIRS) $(ROOT)$(plgdir) +- $(INSTALL_PROG) $(squeak) $(ROOT)$(plgdir) +- $(MKINSTALLDIRS) $(ROOT)$(bindir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(plgdir) ++ $(INSTALL_PROG) $(squeak) $(DESTDIR)$(ROOT)$(plgdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(bindir) + if test -n "$(VM_APP_ICONS)"; then \ +- $(INSTALL_DATA) $(ICONS) $(ROOT)$(VM_APP_ICONS); \ ++ $(INSTALL_DATA) $(ICONS) $(DESTDIR)$(ROOT)$(VM_APP_ICONS); \ + fi + ( path=`$(cfgdir)/relpath $(bindir) $(plgdir)`; \ +- cd $(ROOT)$(bindir); \ ++ cd $(DESTDIR)$(ROOT)$(bindir); \ + rm -f $(squeak); \ + $(LN_S) $$path/$(squeak) .; ) + + uninstall-squeak : .force + if test -n "$(VM_APP_ICONS)"; then \ +- $(UNINSTALL) $(ROOT)$(VM_APP_ICONS); \ ++ $(UNINSTALL) $(DESTDIR)$(ROOT)$(VM_APP_ICONS); \ + fi +- @$(UNINSTALL) $(ROOT)$(plgdir) $(squeak) +- @$(UNINSTALL) $(ROOT)$(bindir) $(squeak) ++ @$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) $(squeak) ++ @$(UNINSTALL) $(DESTDIR)$(ROOT)$(bindir) $(squeak) + + # plugins + + install-plugins : plugins +- $(MKINSTALLDIRS) $(ROOT)$(plgdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(plgdir) + @list='$(PLUGINS_LA)'; for p in $$list; do \ + if test -f */$$p; then \ +- echo "$(LIBTOOL) --mode=install $(INSTALL_PROG) $$p $(ROOT)$(plgdir)/$$p"; \ +- $(LIBTOOL) --mode=install $(INSTALL_PROG) */$$p $(ROOT)$(plgdir)/$$p; \ ++ echo "$(LIBTOOL) --mode=install $(INSTALL_PROG) $$p $(DESTDIR)$(ROOT)$(plgdir)/$$p"; \ ++ $(LIBTOOL) --mode=install $(INSTALL_PROG) */$$p $(DESTDIR)$(ROOT)$(plgdir)/$$p; \ + else :; fi; \ + done +- -rm $(ROOT)$(plgdir)/*.la ++ -rm $(DESTDIR)$(ROOT)$(plgdir)/*.la + + uninstall-plugins : .force + @list='$(PLUGINS_LA)'; for p in $$list; do \ +- filename=$(ROOT)/$(plgdir)/`basename $$p .la`;\ ++ filename=$(DESTDIR)$(ROOT)/$(plgdir)/`basename $$p .la`;\ + if test -f $$filename; then \ + echo "$(LIBTOOL) --mode=uninstall rm -f $$filename"; \ + $(LIBTOOL) --mode=uninstall rm -f $$filename; \ + else + echo "$$filename does not exist"; fi; \ + done +- @$(UNINSTALL) $(ROOT)$(plgdir) ++ @$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) + + # doc + + install-doc : squeak.1 +- $(MKINSTALLDIRS) $(ROOT)$(docdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(docdir) + @list='$(DOCFILES)'; for f in $$list; do \ +- echo $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \ +- $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \ ++ echo $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(DESTDIR)$(ROOT)$(docdir); \ ++ $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(DESTDIR)$(ROOT)$(docdir); \ + done +- -gzip -f9 $(ROOT)$(docdir)/* +- $(MKINSTALLDIRS) $(ROOT)$(mandir)/man1 +- $(INSTALL_DATA) squeak.1 $(ROOT)$(mandir)/man1 +- rm -f $(ROOT)$(mandir)/man1/inisqueak.1 $(ROOT)$(mandir)/man1/inisqueak.1.gz +- if test -f $(ROOT)$(mandir)/man1/squeak.1; then $(LN) $(ROOT)$(mandir)/man1/squeak.1 $(ROOT)$(mandir)/man1/inisqueak.1; fi +- if test -f $(ROOT)$(mandir)/man1/squeak.1.gz; then $(LN) $(ROOT)$(mandir)/man1/squeak.1.gz $(ROOT)$(mandir)/man1/inisqueak.1.gz; fi ++ -gzip -f9 $(DESTDIR)$(ROOT)$(docdir)/* ++ $(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(mandir)/man1 ++ $(INSTALL_DATA) squeak.1 $(DESTDIR)$(ROOT)$(mandir)/man1 ++ rm -f $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1 $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1.gz ++ if test -f $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1; then $(LN) $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1 $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1; fi ++ if test -f $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1.gz; then $(LN) $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1.gz $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1.gz; fi + + uninstall-doc : + @list='$(DOCFILES)'; for f in $$list; do \ +- rm -fv $(ROOT)$(docdir)/$$f.gz; \ ++ rm -fv $(DESTDIR)$(ROOT)$(docdir)/$$f.gz; \ + done +- @$(UNINSTALL) $(ROOT)$(docdir) $(DOCFILES) +- @$(UNINSTALL) $(ROOT)$(mandir)/man1 squeak.1 inisqueak.1 ++ @$(UNINSTALL) $(DESTDIR)$(ROOT)$(docdir) $(DOCFILES) ++ @$(UNINSTALL) $(DESTDIR)$(ROOT)$(mandir)/man1 squeak.1 inisqueak.1 + + # image + + install-image : inisqueak $(topdir)/Squeak$(SQ_VERSION).image.gz $(topdir)/Squeak$(SQ_VERSION).changes.gz +- $(MKINSTALLDIRS) $(ROOT)$(imgdir) +- $(INSTALL_PROG) inisqueak $(ROOT)$(imgdir) +- $(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).image.gz $(ROOT)$(imgdir) +- $(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).changes.gz $(ROOT)$(imgdir) +- $(LN_S) Squeak$(SQ_VERSION).image.gz $(ROOT)$(imgdir)/squeak.image.gz +- $(LN_S) Squeak$(SQ_VERSION).changes.gz $(ROOT)$(imgdir)/squeak.changes.gz +- $(MKINSTALLDIRS) $(ROOT)$(bindir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(imgdir) ++ $(INSTALL_PROG) inisqueak $(DESTDIR)$(ROOT)$(imgdir) ++ $(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).image.gz $(DESTDIR)$(ROOT)$(imgdir) ++ $(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).changes.gz $(DESTDIR)$(ROOT)$(imgdir) ++ $(LN_S) Squeak$(SQ_VERSION).image.gz $(DESTDIR)$(ROOT)$(imgdir)/squeak.image.gz ++ $(LN_S) Squeak$(SQ_VERSION).changes.gz $(DESTDIR)$(ROOT)$(imgdir)/squeak.changes.gz ++ $(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(bindir) + ( path=`$(cfgdir)/relpath $(bindir) $(imgdir)`; \ +- cd $(ROOT)$(bindir); \ ++ cd $(DESTDIR)$(ROOT)$(bindir); \ + rm -f inisqueak; \ + $(LN_S) $$path/inisqueak .; ) + + uninstall-image : +- @$(UNINSTALL) $(ROOT)$(plgdir) Squeak$(SQ_VERSION).image.gz +- @$(UNINSTALL) $(ROOT)$(plgdir) Squeak$(SQ_VERSION).changes.gz +- @$(UNINSTALL) $(ROOT)$(plgdir) inisqueak ++ @$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) Squeak$(SQ_VERSION).image.gz ++ @$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) Squeak$(SQ_VERSION).changes.gz ++ @$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) inisqueak + + # sources + + install-sources : +- $(MKINSTALLDIRS) $(ROOT)$(imgdir) +- $(INSTALL_DATA) $(topdir)/SqueakV$(SQ_MAJOR).sources $(ROOT)$(imgdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(imgdir) ++ $(INSTALL_DATA) $(topdir)/SqueakV$(SQ_MAJOR).sources $(DESTDIR)$(ROOT)$(imgdir) + + uninstall-sources : +- @$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_MAJOR).sources ++ @$(UNINSTALL) $(DESTDIR)$(ROOT)$(imgdir) SqueakV$(SQ_MAJOR).sources + + # npsqueak + + install-npsqueak : npsqueak .force +- $(SHELL) -ec 'cd nps; $(MAKE) install ROOT=$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)' ++ $(SHELL) -ec 'cd nps; $(MAKE) install ROOT=$(DESTDIR)$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)' + + uninstall-npsqueak : npsqueak .force +- $(SHELL) -ec 'cd nps; $(MAKE) uninstall ROOT=$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)' ++ $(SHELL) -ec 'cd nps; $(MAKE) uninstall ROOT=$(DESTDIR)$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)' +diff --git a/platforms/unix/config/acinclude.m4 b/platforms/unix/config/acinclude.m4 +index acaf3c5..a712864 100644 +--- a/platforms/unix/config/acinclude.m4 ++++ b/platforms/unix/config/acinclude.m4 +@@ -92,12 +92,12 @@ AC_DEFUN([AC_CHECK_INT64_T],[ + AC_MSG_ERROR([could not find a 64-bit integer type]) + fi + SQUEAK_INT64_T="$ac_cv_int64_t" +- AC_DEFINE_UNQUOTED(squeakInt64, $ac_cv_int64_t)]) ++ AC_DEFINE_UNQUOTED(squeakInt64, $ac_cv_int64_t, "64bit type")]) + + + AC_DEFUN([AC_NEED_SUNOS_H], + [case "$host" in +- *-sunos*) AC_DEFINE(NEED_SUNOS_H, 1) ++ *-sunos*) AC_DEFINE(NEED_SUNOS_H, 1, "sunos") + esac]) + + +@@ -118,7 +118,7 @@ if test "$GCC" = yes; then + ac_optflags="-O3 -funroll-loops -mcpu=750 -mno-fused-madd" + ;; + esac +- AC_DEFINE(VM_BUILD_STRING, ["Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__]) ++ AC_DEFINE(VM_BUILD_STRING, ["Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__], "Build string") + else + ac_optflags="-O" + ac_vm_build_date="`date`" +@@ -177,38 +177,38 @@ AC_DEFUN([AC_CHECK_ATEXIT], + AC_TRY_COMPILE([#include <stdlib.h>],[on_exit(0);], ac_cv_atexit="on_exit", + ac_cv_atexit="no"))) + if test "$ac_cv_atexit" != "no"; then +- AC_DEFINE_UNQUOTED(AT_EXIT, $ac_cv_atexit) ++ AC_DEFINE_UNQUOTED(AT_EXIT, $ac_cv_atexit, "atexit or on_exit") + fi]) + + AC_DEFUN([AC_CHECK_SOCKLEN_T], + [AC_CACHE_CHECK([for socklen_t in sys/socket.h], ac_cv_socklen_t, + AC_TRY_COMPILE([#include <sys/socket.h>],[sizeof(socklen_t);], + ac_cv_socklen_t="yes", ac_cv_socklen_t="no")) +-test "$ac_cv_socklen_t" != "yes" && AC_DEFINE(socklen_t, int)]) ++test "$ac_cv_socklen_t" != "yes" && AC_DEFINE(socklen_t, int, "socklen type")]) + + AC_DEFUN([AC_CHECK_TZSET], + [AC_CACHE_CHECK([for tzset], ac_cv_tzset, + AC_TRY_COMPILE([#include <time.h>],[tzet();], + ac_cv_tzset="yes", ac_cv_tzset="no")) +-test "$ac_cv_tzset" != "no" && AC_DEFINE(HAVE_TZSET)]) ++test "$ac_cv_tzset" != "no" && AC_DEFINE(HAVE_TZSET, [1], "tzset")]) + + AC_DEFUN([AC_CHECK_GMTOFF], + [AC_CACHE_CHECK([for gmtoff in struct tm], ac_cv_tm_gmtoff, + AC_TRY_COMPILE([#include <time.h>],[struct tm tm; tm.tm_gmtoff;], + ac_cv_tm_gmtoff="yes", ac_cv_tm_gmtoff="no")) +-test "$ac_cv_tm_gmtoff" != "no" && AC_DEFINE(HAVE_TM_GMTOFF)]) ++test "$ac_cv_tm_gm |