diff --git a/desktop/gnome/base/mozjs/actions.py b/desktop/gnome/base/mozjs/actions.py index 48d93acaf8..2863d922da 100644 --- a/desktop/gnome/base/mozjs/actions.py +++ b/desktop/gnome/base/mozjs/actions.py @@ -9,66 +9,33 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools #WorkDir = "mozjs%s/js/src" % get.srcVERSION() - +ObjDir = "obj" shelltools.export("SHELL","/bin/sh") WorkDir = "firefox-%s" %get.srcVERSION() -def setup(): - shelltools.system("sed -i 's|/usr/local|/usr|g' nsprpub/configure") - #shelltools.cd("js/src") - #shelltools.system("sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl ") - shelltools.export("CC", "gcc") - shelltools.export("CXX", "g++") - shelltools.system("mkdir -p build-js") - shelltools.cd("build-js") - shelltools.export("ac_default_prefix", "/usr") - shelltools.system("sh ../js/src/configure \ - --enable-readline \ - --with-intl-api \ - --disable-debug \ - --disable-debug-symbols \ - --disable-jemalloc \ - --disable-strip \ - --enable-hardening \ - --enable-linker=gold \ - --enable-optimize \ - --enable-readline \ - --enable-release \ - --enable-shared-js \ - --enable-tests \ - --with-intl-api \ - --with-system-zlib \ - --with-system-nspr \ - --without-system-icu") - # --prefix=/usr \ +shelltools.system("export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip") +shelltools.export("MOZBUILD_STATE_PATH", "mozbuild") +shelltools.system("export MOZ_NOSPAM=1") + +def setup(): + # shelltools.export("CC", "gcc") + # shelltools.export("CXX", "g++") + # shelltools.system("cp mozconfig .mozconfig") + shelltools.system("cp mozconfig js/src/.mozconfig") + def build(): - shelltools.cd("build-js") - autotools.make("prefix=/usr") - -# def check(): # shelltools.cd("build-js") - - #autotools.make("-C js/src check-jstests") - #autotools.make("-C js/src check-jit-test") + shelltools.system("./mach build") def install(): - shelltools.cd("build-js") - autotools.rawInstall("DESTDIR=%s prefix=/usr" % get.installDIR()) + shelltools.system("DESTDIR=%s ./mach install " % get.installDIR()) pisitools.remove("/usr/lib/*.ajs") - pisitools.dosym("/usr/lib/libmozjs-143.so", "/usr/lib/libmozjs-143.so.0") + pisitools.dosym("/usr/lib/libmozjs-140.so", "/usr/lib/libmozjs-140.so.0") - pisitools.dosed("%s/usr/bin/js128-config" % get.installDIR(), "usr/local", "usr") - pisitools.dosed("%s/usr/lib/pkgconfig/mozjs-143.pc" % get.installDIR(), "usr/local", "usr") - - #for polkit - #pisitools.rename("/usr/lib/pkgconfig/mozjs-..pc", "mozjs-17.0.pc") - #pisitools.remove("usr/lib/libmozjs-..a") - - shelltools.cd("..") pisitools.dodoc("README*") # add link for polkit diff --git a/desktop/gnome/base/mozjs2/files/0001-Bug-1973994-mozjs-140.pc-does-not-contain-DXP_UNIX-o.patch b/desktop/gnome/base/mozjs/files/0001-Bug-1973994-mozjs-140.pc-does-not-contain-DXP_UNIX-o.patch similarity index 100% rename from desktop/gnome/base/mozjs2/files/0001-Bug-1973994-mozjs-140.pc-does-not-contain-DXP_UNIX-o.patch rename to desktop/gnome/base/mozjs/files/0001-Bug-1973994-mozjs-140.pc-does-not-contain-DXP_UNIX-o.patch diff --git a/desktop/gnome/base/mozjs2/files/mozconfig b/desktop/gnome/base/mozjs/files/mozconfig similarity index 100% rename from desktop/gnome/base/mozjs2/files/mozconfig rename to desktop/gnome/base/mozjs/files/mozconfig diff --git a/desktop/gnome/base/mozjs/pspec.xml b/desktop/gnome/base/mozjs/pspec.xml index 385799857f..3008152031 100644 --- a/desktop/gnome/base/mozjs/pspec.xml +++ b/desktop/gnome/base/mozjs/pspec.xml @@ -13,6 +13,9 @@ Stand-alone JavaScript C Library Spidermonkey is Mozilla's C implementation of JavaScript. https://ftp.mozilla.org/pub/firefox/releases/140.3.1esr/source/firefox-140.3.1esr.source.tar.xz + + mozconfig + rust llvm @@ -24,7 +27,7 @@ readline-devel - mozjs128-fix-soname.patch + 0001-Bug-1973994-mozjs-140.pc-does-not-contain-DXP_UNIX-o.patch diff --git a/desktop/gnome/base/mozjs2/actions.py b/desktop/gnome/base/mozjs2/actions.py deleted file mode 100644 index 2863d922da..0000000000 --- a/desktop/gnome/base/mozjs2/actions.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import get -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools - -#WorkDir = "mozjs%s/js/src" % get.srcVERSION() -ObjDir = "obj" -shelltools.export("SHELL","/bin/sh") -WorkDir = "firefox-%s" %get.srcVERSION() - - -shelltools.system("export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip") -shelltools.export("MOZBUILD_STATE_PATH", "mozbuild") -shelltools.system("export MOZ_NOSPAM=1") - -def setup(): - # shelltools.export("CC", "gcc") - # shelltools.export("CXX", "g++") - # shelltools.system("cp mozconfig .mozconfig") - shelltools.system("cp mozconfig js/src/.mozconfig") - - -def build(): - # shelltools.cd("build-js") - shelltools.system("./mach build") - - -def install(): - shelltools.system("DESTDIR=%s ./mach install " % get.installDIR()) - pisitools.remove("/usr/lib/*.ajs") - - pisitools.dosym("/usr/lib/libmozjs-140.so", "/usr/lib/libmozjs-140.so.0") - - pisitools.dodoc("README*") - - # add link for polkit - #pisitools.dosym("libmozjs-..so", "/usr/lib/libmozjs-17.0.so") diff --git a/desktop/gnome/base/mozjs2/files/mozjs128-fix-soname.patch b/desktop/gnome/base/mozjs2/files/mozjs128-fix-soname.patch deleted file mode 100644 index dd42ea0e99..0000000000 --- a/desktop/gnome/base/mozjs2/files/mozjs128-fix-soname.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= -Date: Wed, 15 Jul 2020 08:21:47 +0200 -Subject: [PATCH] Add soname switch to linker, regardless of Operating System - -Fix backported from Debian: http://bugs.debian.org/746705 ---- - config/rules.mk | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config/rules.mk b/config/rules.mk -index 90a9946..dc87789 100644 ---- a/config/rules.mk -+++ b/config/rules.mk -@@ -291,6 +291,8 @@ ifeq ($(OS_ARCH),GNU) - OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 - endif - -+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0 -+ - # - # MINGW32 - # --- -2.37.1 diff --git a/desktop/gnome/base/mozjs2/orj-actions.py b/desktop/gnome/base/mozjs2/orj-actions.py deleted file mode 100644 index 48d93acaf8..0000000000 --- a/desktop/gnome/base/mozjs2/orj-actions.py +++ /dev/null @@ -1,75 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import get -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools - -#WorkDir = "mozjs%s/js/src" % get.srcVERSION() - -shelltools.export("SHELL","/bin/sh") -WorkDir = "firefox-%s" %get.srcVERSION() - -def setup(): - shelltools.system("sed -i 's|/usr/local|/usr|g' nsprpub/configure") - #shelltools.cd("js/src") - #shelltools.system("sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl ") - shelltools.export("CC", "gcc") - shelltools.export("CXX", "g++") - - shelltools.system("mkdir -p build-js") - shelltools.cd("build-js") - shelltools.export("ac_default_prefix", "/usr") - shelltools.system("sh ../js/src/configure \ - --enable-readline \ - --with-intl-api \ - --disable-debug \ - --disable-debug-symbols \ - --disable-jemalloc \ - --disable-strip \ - --enable-hardening \ - --enable-linker=gold \ - --enable-optimize \ - --enable-readline \ - --enable-release \ - --enable-shared-js \ - --enable-tests \ - --with-intl-api \ - --with-system-zlib \ - --with-system-nspr \ - --without-system-icu") - # --prefix=/usr \ - -def build(): - shelltools.cd("build-js") - autotools.make("prefix=/usr") - -# def check(): - # shelltools.cd("build-js") - - #autotools.make("-C js/src check-jstests") - #autotools.make("-C js/src check-jit-test") - - -def install(): - shelltools.cd("build-js") - autotools.rawInstall("DESTDIR=%s prefix=/usr" % get.installDIR()) - pisitools.remove("/usr/lib/*.ajs") - - pisitools.dosym("/usr/lib/libmozjs-143.so", "/usr/lib/libmozjs-143.so.0") - - pisitools.dosed("%s/usr/bin/js128-config" % get.installDIR(), "usr/local", "usr") - pisitools.dosed("%s/usr/lib/pkgconfig/mozjs-143.pc" % get.installDIR(), "usr/local", "usr") - - #for polkit - #pisitools.rename("/usr/lib/pkgconfig/mozjs-..pc", "mozjs-17.0.pc") - #pisitools.remove("usr/lib/libmozjs-..a") - - shelltools.cd("..") - pisitools.dodoc("README*") - - # add link for polkit - #pisitools.dosym("libmozjs-..so", "/usr/lib/libmozjs-17.0.so") diff --git a/desktop/gnome/base/mozjs2/pspec.xml b/desktop/gnome/base/mozjs2/pspec.xml deleted file mode 100644 index 3008152031..0000000000 --- a/desktop/gnome/base/mozjs2/pspec.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - mozjs - http://www.mozilla.org/js/spidermonkey/ - - PisiLinux Community - admins@pisilinux.org - - NPL-1.1 - library - Stand-alone JavaScript C Library - Spidermonkey is Mozilla's C implementation of JavaScript. - https://ftp.mozilla.org/pub/firefox/releases/140.3.1esr/source/firefox-140.3.1esr.source.tar.xz - - mozconfig - - - rust - llvm - cbindgen - zlib-devel - nspr-devel - autoconf213 - python3-devel - readline-devel - - - 0001-Bug-1973994-mozjs-140.pc-does-not-contain-DXP_UNIX-o.patch - - - - mozjs - - nspr - zlib - libgcc - readline - - - /usr/bin - /usr/lib - /usr/share/doc - - - - - mozjs-devel - Development files for spidermonkey - - nspr-devel - mozjs - - - /usr/include - /usr/lib/pkgconfig - - - - - - - 2025-09-25 - 140.3.1 - Version bump. - Pisi Linux Community - admin@pisilinux.org - - - 2024-09-11 - 128.2.0 - First release - Mustafa Cinasal - muscnsl@gmail.com - - - diff --git a/desktop/gnome/base/mozjs2/translations.xml b/desktop/gnome/base/mozjs2/translations.xml deleted file mode 100644 index 04ee141abe..0000000000 --- a/desktop/gnome/base/mozjs2/translations.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - spidermonkey - Javascript C Kitaplığı - Mozilla'nın Javascript'in C implementasyonu. - Spidermonkey est l'Implémentation C de Javascript par Mozilla. - Spidermonkey es la implementación de JavaScript con C de Mozilla. - - - - spidermonkey-devel - spidermonkey için geliştirme dosyaları - -