Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7e6acf326bc52fbd97d5e330799240f977db5ccb
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7e6acf326bc52fbd97d5e330799240f977db5ccb
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7e6acf326bc52fbd97d5e330799240f977db5ccb
The branch, master has been updated
via 7e6acf326bc52fbd97d5e330799240f977db5ccb (commit)
via 700c12aa9db71ec8d4d4546d8ba45e2398d273aa (commit)
via ec9d6b15d5f89d543d0741b872d2904e7a6c8f3d (commit)
via 9ad2be2205108e536ec9c56aa441aaa9aad74068 (commit)
from a8ff4ab2285150b8805154c1f9281d60626ea4c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7e6acf326bc52fbd97d5e330799240f977db5ccb
commit 7e6acf326bc52fbd97d5e330799240f977db5ccb
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
arm-riscos-gnueabi: require SharedULib 1.16
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile
index 2b59591..265f928 100644
--- a/frontends/riscos/Makefile
+++ b/frontends/riscos/Makefile
@@ -115,7 +115,7 @@ $(FRONTEND_SOURCE_DIR)/appdir/!Run$(RUNEXT):
$(FRONTEND_SOURCE_DIR)/scripts/Run
$(VQ)echo " MAKERUN: $@"
$(Q)$(MAKERUN) $(EXETARGET) $< $@
ifeq ($(findstring -elfeabi,$(SUBTARGET)),-elfeabi)
- $(Q)$(SED) -i -e 's/^|\(RMEnsure ARMEABISupport\)/\1/' $@
+ $(Q)$(SED) -i -e 's/^|\(RMEnsure ARMEABISupport\)/\1/' -e
's/SharedUnixLibrary 1\.07/SharedUnixLibrary 1.16/g' $@
endif
$(FRONTEND_SOURCE_DIR)/appdir/!Help$(RUNEXT):
$(FRONTEND_SOURCE_DIR)/scripts/Help
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=700c12aa9db71ec8d4d4546d8ba45e2398d273aa
commit 700c12aa9db71ec8d4d4546d8ba45e2398d273aa
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
RISC OS: add ARMEABISupport 1.05
diff --git
a/frontends/riscos/distribution/!System/400/Modules/ARMEABISupport,ffa
b/frontends/riscos/distribution/!System/400/Modules/ARMEABISupport,ffa
new file mode 100644
index 0000000..bfcc3ef
Binary files /dev/null and
b/frontends/riscos/distribution/!System/400/Modules/ARMEABISupport,ffa differ
diff --git a/frontends/riscos/distribution/3rdParty/ARMEABISupport/Copyright
b/frontends/riscos/distribution/3rdParty/ARMEABISupport/Copyright
new file mode 100644
index 0000000..8bb7d7e
--- /dev/null
+++ b/frontends/riscos/distribution/3rdParty/ARMEABISupport/Copyright
@@ -0,0 +1,20 @@
+Copyright (c) 2019-2022 Lee Noar
+Copyright (c) 2019-2022 GCCSDK Developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=ec9d6b15d5f89d543d0741b872d2904e7a6c8f3d
commit ec9d6b15d5f89d543d0741b872d2904e7a6c8f3d
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
RISC OS: update SharedULib to 1.16
diff --git a/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa
b/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa
old mode 100755
new mode 100644
index 8dd0dd2..045d6a3
Binary files a/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa
and b/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa differ
diff --git a/frontends/riscos/distribution/3rdParty/SharedULib/Copyright
b/frontends/riscos/distribution/3rdParty/SharedULib/Copyright
index b6784ed..4939ec3 100644
--- a/frontends/riscos/distribution/3rdParty/SharedULib/Copyright
+++ b/frontends/riscos/distribution/3rdParty/SharedULib/Copyright
@@ -7,9 +7,9 @@ Nicholas Clark and Peter Burwood.
These contributors have expressed "no interest" in any further licensing or
copyright in regards to UnixLib.
-Other sections are (c) 1999-2006 Nick Burrett, John Tytgat, Peter Naulls,
-Peter Teichmann, Alex Waugh, Christian Ludlam, Theo Markettos, Graham Shaw,
-James Bursa and John-Mark Bell.
+Other sections are (c) 1999-2011 Nick Burrett, John Tytgat, Peter Naulls,
+Lee Noar, Peter Teichmann, Alex Waugh, Christian Ludlam, Theo Markettos,
+Graham Shaw, James Bursa and John-Mark Bell.
In January 2005, permission was obtained from all relevant contributors
by Peter Naulls to license all past and present contributions to UnixLib
@@ -86,7 +86,7 @@ http://www.fsf.org/licenses/why-not-lgpl.html
===========================================================================
- Copyright (c) 1995-2005 UnixLib Developers
+ Copyright (c) 1995-2009 UnixLib Developers
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -280,7 +280,6 @@ works together with the library.
Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.
-
GNU LIBRARY GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -631,8 +630,8 @@ safest to attach them to the start of each source file to
most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -658,7 +657,7 @@ necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
- <signature of Ty Coon>, 1 April 1990
+ <signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=9ad2be2205108e536ec9c56aa441aaa9aad74068
commit 9ad2be2205108e536ec9c56aa441aaa9aad74068
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
jenkins-build: add arm-riscos-gnueabi
diff --git a/tools/jenkins-build.sh b/tools/jenkins-build.sh
index d31b233..7dcd788 100755
--- a/tools/jenkins-build.sh
+++ b/tools/jenkins-build.sh
@@ -54,11 +54,16 @@ MAKE=make
# NetSurf version number haiku needs it for package name
NETSURF_VERSION="3.11"
+UPDATE_LATEST=yes
+
# Ensure the combination of target and toolchain works and set build
# specific parameters too
case ${TARGET} in
"riscos")
case ${HOST} in
+ "arm-riscos-gnueabi")
+ UPDATE_LATEST=no
+ ;;
"arm-unknown-riscos")
;;
@@ -69,6 +74,10 @@ case ${TARGET} in
esac
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
+ IDENTIFIER="${HOST}-${IDENTIFIER}"
+ OLD_IDENTIFIER="${HOST}-${OLD_IDENTIFIER}"
PKG_SRC=netsurf
PKG_SFX=.zip
;;
@@ -285,6 +294,11 @@ case ${TARGET} in
MAKE=gmake
;;
+ "arm-riscos-gnueabi")
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
+ ;;
+
"arm-unknown-riscos")
export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
@@ -341,6 +355,11 @@ case ${TARGET} in
MAKE=gmake
;;
+ "arm-riscos-gnueabi")
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
+ ;;
+
"arm-unknown-riscos")
export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
@@ -483,4 +502,7 @@ done
############ Expired package artifact removal and latest linking ##############
-ssh [email protected] "rm -f ${OLD_ARTIFACT_TARGETS}
${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" >
${DESTDIR}/LATEST"
+ssh [email protected] "rm -f ${OLD_ARTIFACT_TARGETS}"
+if [ ${UPDATE_LATEST} = "yes" ]; then
+ ssh [email protected] "rm -f ${DESTDIR}/LATEST && echo
"${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST"
+fi
-----------------------------------------------------------------------
Summary of changes:
frontends/riscos/Makefile | 2 +-
.../!System/310/Modules/SharedULib,ffa | Bin 3116 -> 3192 bytes
.../!System/400/Modules/ARMEABISupport,ffa | Bin 0 -> 26504 bytes
.../{Iconv/ReadMe => ARMEABISupport/Copyright} | 29 ++------------------
.../distribution/3rdParty/SharedULib/Copyright | 15 +++++-----
tools/jenkins-build.sh | 24 +++++++++++++++-
6 files changed, 33 insertions(+), 37 deletions(-)
mode change 100755 => 100644
frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa
create mode 100644
frontends/riscos/distribution/!System/400/Modules/ARMEABISupport,ffa
copy frontends/riscos/distribution/3rdParty/{Iconv/ReadMe =>
ARMEABISupport/Copyright} (53%)
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile
index 2b59591..265f928 100644
--- a/frontends/riscos/Makefile
+++ b/frontends/riscos/Makefile
@@ -115,7 +115,7 @@ $(FRONTEND_SOURCE_DIR)/appdir/!Run$(RUNEXT):
$(FRONTEND_SOURCE_DIR)/scripts/Run
$(VQ)echo " MAKERUN: $@"
$(Q)$(MAKERUN) $(EXETARGET) $< $@
ifeq ($(findstring -elfeabi,$(SUBTARGET)),-elfeabi)
- $(Q)$(SED) -i -e 's/^|\(RMEnsure ARMEABISupport\)/\1/' $@
+ $(Q)$(SED) -i -e 's/^|\(RMEnsure ARMEABISupport\)/\1/' -e
's/SharedUnixLibrary 1\.07/SharedUnixLibrary 1.16/g' $@
endif
$(FRONTEND_SOURCE_DIR)/appdir/!Help$(RUNEXT):
$(FRONTEND_SOURCE_DIR)/scripts/Help
diff --git a/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa
b/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa
old mode 100755
new mode 100644
index 8dd0dd2..045d6a3
Binary files a/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa
and b/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa differ
diff --git
a/frontends/riscos/distribution/!System/400/Modules/ARMEABISupport,ffa
b/frontends/riscos/distribution/!System/400/Modules/ARMEABISupport,ffa
new file mode 100644
index 0000000..bfcc3ef
Binary files /dev/null and
b/frontends/riscos/distribution/!System/400/Modules/ARMEABISupport,ffa differ
diff --git a/frontends/riscos/distribution/3rdParty/Iconv/ReadMe
b/frontends/riscos/distribution/3rdParty/ARMEABISupport/Copyright
similarity index 53%
copy from frontends/riscos/distribution/3rdParty/Iconv/ReadMe
copy to frontends/riscos/distribution/3rdParty/ARMEABISupport/Copyright
index 907c2c7..8bb7d7e 100644
--- a/frontends/riscos/distribution/3rdParty/Iconv/ReadMe
+++ b/frontends/riscos/distribution/3rdParty/ARMEABISupport/Copyright
@@ -1,30 +1,5 @@
-What is Iconv?
-==============
-
-Iconv is a module which provides character set conversion akin to that provided
-by the C iconv() function.
-
-Iconv Installation instructions
-===============================
-
-To install the Iconv module, simply use the System merge utility provided by
-Configure to merge the !System directory provided with the one on your system.
-
-Use the Boot merge facility in Configure to merge the provided !Boot directory
-with the one on your system. If there is no !Boot merge facility provided on
-your system, simply drag the !Boot directory over your existing boot structure.
-
-Further documentation can be found in the "doc" directory.
-
-Note for developers:
-~~~~~~~~~~~~~~~~~~~~
-The "stubs" directory contains source for a set of C stubs.
-See the ReadMe file in that directory for further information.
-
-Licence
-=======
-
-Iconv is Copyright ? 2004-13 J-M Bell
+Copyright (c) 2019-2022 Lee Noar
+Copyright (c) 2019-2022 GCCSDK Developers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/frontends/riscos/distribution/3rdParty/SharedULib/Copyright
b/frontends/riscos/distribution/3rdParty/SharedULib/Copyright
index b6784ed..4939ec3 100644
--- a/frontends/riscos/distribution/3rdParty/SharedULib/Copyright
+++ b/frontends/riscos/distribution/3rdParty/SharedULib/Copyright
@@ -7,9 +7,9 @@ Nicholas Clark and Peter Burwood.
These contributors have expressed "no interest" in any further licensing or
copyright in regards to UnixLib.
-Other sections are (c) 1999-2006 Nick Burrett, John Tytgat, Peter Naulls,
-Peter Teichmann, Alex Waugh, Christian Ludlam, Theo Markettos, Graham Shaw,
-James Bursa and John-Mark Bell.
+Other sections are (c) 1999-2011 Nick Burrett, John Tytgat, Peter Naulls,
+Lee Noar, Peter Teichmann, Alex Waugh, Christian Ludlam, Theo Markettos,
+Graham Shaw, James Bursa and John-Mark Bell.
In January 2005, permission was obtained from all relevant contributors
by Peter Naulls to license all past and present contributions to UnixLib
@@ -86,7 +86,7 @@ http://www.fsf.org/licenses/why-not-lgpl.html
===========================================================================
- Copyright (c) 1995-2005 UnixLib Developers
+ Copyright (c) 1995-2009 UnixLib Developers
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -280,7 +280,6 @@ works together with the library.
Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.
-
GNU LIBRARY GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -631,8 +630,8 @@ safest to attach them to the start of each source file to
most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -658,7 +657,7 @@ necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
- <signature of Ty Coon>, 1 April 1990
+ <signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!
diff --git a/tools/jenkins-build.sh b/tools/jenkins-build.sh
index d31b233..7dcd788 100755
--- a/tools/jenkins-build.sh
+++ b/tools/jenkins-build.sh
@@ -54,11 +54,16 @@ MAKE=make
# NetSurf version number haiku needs it for package name
NETSURF_VERSION="3.11"
+UPDATE_LATEST=yes
+
# Ensure the combination of target and toolchain works and set build
# specific parameters too
case ${TARGET} in
"riscos")
case ${HOST} in
+ "arm-riscos-gnueabi")
+ UPDATE_LATEST=no
+ ;;
"arm-unknown-riscos")
;;
@@ -69,6 +74,10 @@ case ${TARGET} in
esac
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
+ IDENTIFIER="${HOST}-${IDENTIFIER}"
+ OLD_IDENTIFIER="${HOST}-${OLD_IDENTIFIER}"
PKG_SRC=netsurf
PKG_SFX=.zip
;;
@@ -285,6 +294,11 @@ case ${TARGET} in
MAKE=gmake
;;
+ "arm-riscos-gnueabi")
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
+ ;;
+
"arm-unknown-riscos")
export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
@@ -341,6 +355,11 @@ case ${TARGET} in
MAKE=gmake
;;
+ "arm-riscos-gnueabi")
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
+ ;;
+
"arm-unknown-riscos")
export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
@@ -483,4 +502,7 @@ done
############ Expired package artifact removal and latest linking ##############
-ssh [email protected] "rm -f ${OLD_ARTIFACT_TARGETS}
${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" >
${DESTDIR}/LATEST"
+ssh [email protected] "rm -f ${OLD_ARTIFACT_TARGETS}"
+if [ ${UPDATE_LATEST} = "yes" ]; then
+ ssh [email protected] "rm -f ${DESTDIR}/LATEST && echo
"${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST"
+fi
--
NetSurf Browser_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
