summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch59
-rw-r--r--gnu/packages/patches/fossil-test-fixes.patch189
-rw-r--r--gnu/packages/patches/icedtea-remove-overrides.patch291
3 files changed, 59 insertions, 480 deletions
diff --git a/gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch b/gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch
new file mode 100644
index 0000000000..ccece0f466
--- /dev/null
+++ b/gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch
@@ -0,0 +1,59 @@
+From a4b093f7366fdb429ca1781144d3985fa50d0fbb Mon Sep 17 00:00:00 2001
+From: Julien Grall <julien.grall@linaro.org>
+Date: Tue, 17 Mar 2015 16:00:34 +0000
+Subject: [PATCH] libfdt: Add missing functions to shared library
+
+The commit 4e76ec7 "libfdt: Add fdt_next_subnode() to permit easy
+subnode iteration" adds new functions (fdt_{first,next}_subnode) but
+forgot to mark them as 'global' in the shared library.
+
+Signed-off-by: Julien Grall <julien.grall@linaro.org>
+---
+ libfdt/version.lds | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libfdt/version.lds b/libfdt/version.lds
+index 80b322b..941208e 100644
+--- a/libfdt/version.lds
++++ b/libfdt/version.lds
+@@ -54,6 +54,8 @@ LIBFDT_1.2 {
+ fdt_get_property_by_offset;
+ fdt_getprop_by_offset;
+ fdt_next_property_offset;
++ fdt_first_subnode;
++ fdt_next_subnode;
+
+ local:
+ *;
+From f58799be130e27cc729cb2d45566daa0bb3b8605 Mon Sep 17 00:00:00 2001
+From: David Gibson <david@gibson.dropbear.id.au>
+Date: Tue, 1 Dec 2015 12:55:21 +1100
+Subject: [PATCH] libfdt: Add some missing symbols to version.lds
+
+Several functions in the header file were missing from the version.lds
+script, meaning that they couldn't be used from a libfdt shared library.
+
+Reported by Ken Aaker, via github issue tracker.
+
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+---
+ libfdt/version.lds | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libfdt/version.lds b/libfdt/version.lds
+index f19f157..1f4e1ea 100644
+--- a/libfdt/version.lds
++++ b/libfdt/version.lds
+@@ -57,6 +57,10 @@ LIBFDT_1.2 {
+ fdt_next_property_offset;
+ fdt_first_subnode;
+ fdt_next_subnode;
++ fdt_address_cells;
++ fdt_size_cells;
++ fdt_stringlist_contains;
++ fdt_resize;
+
+ local:
+ *;
+--
+2.8.1
diff --git a/gnu/packages/patches/fossil-test-fixes.patch b/gnu/packages/patches/fossil-test-fixes.patch
deleted file mode 100644
index e6c9f3dd74..0000000000
--- a/gnu/packages/patches/fossil-test-fixes.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From upstream commit https://www.fossil-scm.org/fossil/info/19c216391a0ad79e
-
---- fossil-src-1.34/test/file1.test
-+++ fossil-src-1.34/test/file1.test
-@@ -15,10 +15,12 @@
- #
- ############################################################################
- #
- # File utilities
- #
-+
-+repo_init
-
- proc simplify-name {testname args} {
- set i 1
- foreach {path result} $args {
- fossil test-simplify-name $path
-@@ -65,10 +67,13 @@
-
- if {$::tcl_platform(os)=="Windows NT"} {
- simplify-name 108 //?/a:/a/b a:/a/b //?/UNC/a/b //a/b //?/ {}
- simplify-name 109 \\\\?\\a:\\a\\b a:/a/b \\\\?\\UNC\\a\\b //a/b \\\\?\\ {}
- }
-+
-+# This is needed because we are now running outside of the Fossil checkout.
-+file mkdir file1; cd file1
-
- # Those directories are only needed for the testcase being able to "--chdir" to it.
- file mkdir test1
- file mkdir test1/test2
-
-From upstream commit https://www.fossil-scm.org/fossil/info/ad6de6383391bd4d
-
---- fossil-src-1.34/test/utf.test
-+++ fossil-src-1.34/test/utf.test
-@@ -39,26 +39,29 @@
- test utf-check-$testname.$i {$::RESULT eq $result}
- incr i
- }
- }
-
-+unset -nocomplain enc
- array set enc [list \
- 0 binary \
- 1 binary \
- 2 unicode \
- 3 unicode-reverse \
- ]
-
-+unset -nocomplain bom
- array set bom [list \
- 0 "" \
- 1 \xEF\xBB\xBF \
- 2 [expr {$tcl_platform(byteOrder) eq "littleEndian" ? \
- "\xFF\xFE" : "\xFE\xFF"}] \
- 3 [expr {$tcl_platform(byteOrder) eq "littleEndian" ? \
- "\xFE\xFF" : "\xFF\xFE"}] \
- ]
-
-+unset -nocomplain data
- array set data [list \
- 0 "" \
- 1 \r \
- 2 \n \
- 3 \r\n \
-@@ -239,10 +242,11 @@
- 178 \xF4\x90\x80\x80\r \
- 179 \xF4\x90\x80\x80\n \
- 180 \xF4\x90\x80\x80\r\n \
- ]
-
-+unset -nocomplain extraData
- array set extraData [list \
- 0 "" \
- 1 Z \
- ]
-
-Backport from upstream https://www.fossil-scm.org/fossil/info/60285f5876512817
-with additional non-zero exit in case of failures.
-
---- fossil-src-1.34/test/merge6.test
-+++ fossil-src-1.34/test/merge6.test
-@@ -62,6 +62,6 @@
- fossil ls
-
- test merge_multi-4 {[normalize_result] eq {f1
- f2
- f3
--f4}}
-+f4}} knownBug
-
---- fossil-src-1.34/test/merge_renames.test
-+++ fossil-src-1.34/test/merge_renames.test
-@@ -156,13 +156,13 @@
- }
-
- if {$deletes!=0} {
- # failed
- protOut "Error, the merge should not delete any file"
-- test merge_renames-2 0
-+ test merge_renames-3 0
- } else {
-- test merge_renames-2 1
-+ test merge_renames-3 1
- }
-
- ######################################
- # Test 4 #
- # Reported: Ticket [67176c3aa4] #
-@@ -198,14 +198,14 @@
-
- fossil ls
-
- test merge_renames-5 {[normalize_result] eq {f1
- f2
--f3}}
-+f3}} knownBug
-
- ######################################
- #
- # Tests for troubles not specifically linked with renames but that I'd like to
- # write:
- # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
- # [953031915f] - Lack of warning when overwriting extra files
- # [4df5f38f1e] - Troubles merging a file delete with a file change
-
---- fossil-src-1.34/test/tester.tcl
-+++ fossil-src-1.34/test/tester.tcl
-@@ -58,10 +58,18 @@
- set VERBOSE 1
- set argv [lreplace $argv $i $i]
- } else {
- set VERBOSE 0
- }
-+
-+set i [lsearch $argv -strict]
-+if {$i>=0} {
-+ set STRICT 1
-+ set argv [lreplace $argv $i $i]
-+} else {
-+ set STRICT 0
-+}
-
- if {[llength $argv]==0} {
- foreach f [lsort [glob $testdir/*.test]] {
- set base [file root [file tail $f]]
- lappend argv $base
-@@ -327,20 +335,30 @@
- }
-
- # Perform a test
- #
- set test_count 0
--proc test {name expr} {
-+proc test {name expr {constraints ""}} {
- global bad_test test_count
- incr test_count
-+ set knownBug [expr {"knownBug" in $constraints}]
- set r [uplevel 1 [list expr $expr]]
- if {$r} {
-- protOut "test $name OK"
-+ if {$knownBug && !$::STRICT} {
-+ protOut "test $name OK (knownBug)?"
-+ } else {
-+ protOut "test $name OK"
-+ }
- } else {
-- protOut "test $name FAILED!"
-- lappend bad_test $name
-- if {$::HALT} exit
-+ if {$knownBug && !$::STRICT} {
-+ protOut "test $name FAILED (knownBug)!"
-+ } else {
-+ protOut "test $name FAILED!"
-+ if {$::VERBOSE} {protOut "RESULT: $RESULT"}
-+ lappend bad_test $name
-+ if {$::HALT} exit
-+ }
- }
- }
- set bad_test {}
-
- # Return a random string N characters long.
-@@ -445,4 +455,5 @@
- protOut "***** Final result: $nErr errors out of $test_count tests"
- if {$nErr>0} {
- protOut "***** Failures: $bad_test"
-+ exit 1
- }
diff --git a/gnu/packages/patches/icedtea-remove-overrides.patch b/gnu/packages/patches/icedtea-remove-overrides.patch
deleted file mode 100644
index e4d68a9e58..0000000000
--- a/gnu/packages/patches/icedtea-remove-overrides.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-Upstream patch:
-http://icedtea.classpath.org/hg/icedtea6/rev/60be25a84f2d
-
-Fixes build failure:
-http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2954
-
-Changes to the files 'NEWS' and 'ChangeLog' are omitted here.
-
-# HG changeset patch
-# User Andrew John Hughes <gnu.andrew@redhat.com>
-# Date 1463144538 -3600
-# Node ID 60be25a84f2dd2bce8ff277cc3854cca1b3f7931
-# Parent c23ceebb80a19a33316f1e743eb93bdf79aac220
-PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java
-
-2016-05-13 Andrew John Hughes <gnu.andrew@redhat.com>
-
- PR2954: ecj/override.patch is missing new
- @Overrides in RMIJRMPServerImpl.java
- * patches/ecj/override.patch:
- Add cases in RMIJRMPServerImpl and others
- which show up when source/target 5 is
- used in the rt-class-files pre-build.
- * patches/openjdk/8014205-blank_swing_dialogs_windows.patch:
- Remove addition of @Override.
-
-diff -r c23ceebb80a1 -r 60be25a84f2d patches/ecj/override.patch
---- a/patches/ecj/override.patch Sun May 08 21:28:21 2016 +0100
-+++ b/patches/ecj/override.patch Fri May 13 14:02:18 2016 +0100
-@@ -362,3 +362,240 @@
- public Class<?> run() {
- try {
- ReflectUtil.checkPackageAccess(className);
-+diff -r 545db1dd8c2a src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
-+--- openjdk-ecj/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java Thu May 12 01:30:54 2016 +0100
-+@@ -1870,7 +1870,6 @@
-+
-+ private ModifiableClassLoaderRepository getInstantiatorCLR() {
-+ return AccessController.doPrivileged(new PrivilegedAction<ModifiableClassLoaderRepository>() {
-+- @Override
-+ public ModifiableClassLoaderRepository run() {
-+ return instantiator != null ? instantiator.getClassLoaderRepository() : null;
-+ }
-+diff -r 545db1dd8c2a src/share/classes/com/sun/media/sound/Platform.java
-+--- openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/Platform.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/Platform.java Thu May 12 01:30:54 2016 +0100
-+@@ -160,7 +160,6 @@
-+ try {
-+ // load the main library
-+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
-+- @Override
-+ public Void run() {
-+ System.loadLibrary(libNameMain);
-+ return null;
-+@@ -182,7 +181,6 @@
-+ final String lib = st.nextToken();
-+ try {
-+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
-+- @Override
-+ public Void run() {
-+ System.loadLibrary(lib);
-+ return null;
-+diff -r 545db1dd8c2a src/share/classes/java/awt/EventQueue.java
-+--- openjdk-ecj/jdk/src/share/classes/java/awt/EventQueue.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/java/awt/EventQueue.java Thu May 12 01:30:54 2016 +0100
-+@@ -190,7 +190,6 @@
-+ EventQueue.invokeAndWait(source, r);
-+ }
-+
-+- @Override
-+ public long getMostRecentEventTime(EventQueue eventQueue) {
-+ return eventQueue.getMostRecentEventTimeImpl();
-+ }
-+diff -r 545db1dd8c2a src/share/classes/java/io/ObjectInputStream.java
-+--- openjdk-ecj/jdk/src/share/classes/java/io/ObjectInputStream.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/java/io/ObjectInputStream.java Thu May 12 01:30:54 2016 +0100
-+@@ -3571,7 +3571,6 @@
-+ }
-+ static {
-+ SharedSecrets.setJavaObjectInputStreamAccess(new JavaObjectInputStreamAccess() {
-+- @Override
-+ public void setValidator(ObjectInputStream ois, ObjectStreamClassValidator validator) {
-+ ObjectInputStream.setValidator(ois, validator);
-+ }
-+diff -r 545db1dd8c2a src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
-+--- openjdk-ecj/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Thu May 12 01:30:54 2016 +0100
-+@@ -64,7 +64,6 @@
-+ final String propName = "sun.rmi.server.invocationhandler.allowFinalizeInvocation";
-+ String allowProp = java.security.AccessController.doPrivileged(
-+ new PrivilegedAction<String>() {
-+- @Override
-+ public String run() {
-+ return System.getProperty(propName);
-+ }
-+diff -r 545db1dd8c2a src/share/classes/sun/awt/image/SunVolatileImage.java
-+--- openjdk-ecj/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java Thu May 12 01:30:54 2016 +0100
-+@@ -262,7 +262,6 @@
-+ *
-+ * @see sun.java2d.DestSurfaceProvider#getDestSurface
-+ */
-+- @Override
-+ public Surface getDestSurface() {
-+ return volSurfaceManager.getPrimarySurfaceData();
-+ }
-+diff -r 545db1dd8c2a src/share/classes/sun/java2d/SunGraphics2D.java
-+--- openjdk-ecj/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Thu May 12 01:30:54 2016 +0100
-+@@ -3294,7 +3294,6 @@
-+ *
-+ * @see sun.java2d.DestSurfaceProvider#getDestSurface
-+ */
-+- @Override
-+ public Surface getDestSurface() {
-+ return surfaceData;
-+ }
-+diff -r 545db1dd8c2a src/share/classes/sun/rmi/server/UnicastServerRef.java
-+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java Thu May 12 01:30:54 2016 +0100
-+@@ -630,12 +630,10 @@
-+ this.callID = callID;
-+ }
-+
-+- @Override
-+ public void validateDescriptor(ObjectStreamClass descriptor) {
-+ descriptorCheck.check(method, descriptor, parameterIndex, callID);
-+ }
-+
-+- @Override
-+ public void checkProxyInterfaceNames(String[] ifaces) {
-+ descriptorCheck.checkProxyClass(method, ifaces, parameterIndex, callID);
-+ }
-+diff -r 545db1dd8c2a src/share/classes/sun/rmi/transport/Transport.java
-+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/Transport.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/Transport.java Thu May 12 01:30:54 2016 +0100
-+@@ -133,7 +133,6 @@
-+ */
-+ private static void setContextClassLoader(final ClassLoader ccl) {
-+ AccessController.doPrivileged(new PrivilegedAction<Void> () {
-+- @Override
-+ public Void run() {
-+ Thread.currentThread().setContextClassLoader(ccl);
-+ return null;
-+diff -r 545db1dd8c2a src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
-+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java Thu May 12 01:30:54 2016 +0100
-+@@ -676,7 +676,6 @@
-+ connectionCount.incrementAndGet() +
-+ ")-" + remoteHost);
-+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
-+- @Override
-+ public Void run() {
-+ run0();
-+ return null;
-+diff -r 545db1dd8c2a src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java
-+--- openjdk-ecj/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java Thu May 12 01:30:54 2016 +0100
-+@@ -92,7 +92,6 @@
-+ return this;
-+ }
-+
-+- @Override
-+ public SurfaceData createManagedSurface(int w, int h, int transparency) {
-+ return GLXSurfaceData.createData(this, w, h,
-+ getColorModel(transparency),
-+@@ -165,12 +164,10 @@
-+ * Returns true if the provided capability bit is present for this config.
-+ * See OGLContext.java for a list of supported capabilities.
-+ */
-+- @Override
-+ public final boolean isCapPresent(int cap) {
-+ return ((oglCaps.getCaps() & cap) != 0);
-+ }
-+
-+- @Override
-+ public final long getNativeConfigInfo() {
-+ return pConfigInfo;
-+ }
-+@@ -180,7 +177,6 @@
-+ *
-+ * @see sun.java2d.pipe.hw.BufferedContextProvider#getContext
-+ */
-+- @Override
-+ public final OGLContext getContext() {
-+ return context;
-+ }
-+@@ -394,7 +390,6 @@
-+ *
-+ * @see sun.java2d.pipe.hw.AccelGraphicsConfig#createCompatibleVolatileImage
-+ */
-+- @Override
-+ public VolatileImage
-+ createCompatibleVolatileImage(int width, int height,
-+ int transparency, int type)
-+@@ -434,17 +429,14 @@
-+ *
-+ * @see sun.java2d.pipe.hw.AccelGraphicsConfig#getContextCapabilities
-+ */
-+- @Override
-+ public ContextCapabilities getContextCapabilities() {
-+ return oglCaps;
-+ }
-+
-+- @Override
-+ public void addDeviceEventListener(AccelDeviceEventListener l) {
-+ AccelDeviceEventNotifier.addListener(l, screen.getScreen());
-+ }
-+
-+- @Override
-+ public void removeDeviceEventListener(AccelDeviceEventListener l) {
-+ AccelDeviceEventNotifier.removeListener(l);
-+ }
-+diff -r 545db1dd8c2a src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
-+--- openjdk-ecj/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java Wed May 04 23:23:55 2016 +0100
-++++ openjdk-ecj/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java Thu May 12 01:51:42 2016 +0100
-+@@ -236,7 +236,6 @@
-+ final MBeanInstantiator fInstantiator = instantiator;
-+ this.secureClr = new
-+ SecureClassLoaderRepository(AccessController.doPrivileged(new PrivilegedAction<ClassLoaderRepository>() {
-+- @Override
-+ public ClassLoaderRepository run() {
-+ return fInstantiator.getClassLoaderRepository();
-+ }
-+@@ -1257,7 +1256,6 @@
-+ ClassLoader myLoader = outerShell.getClass().getClassLoader();
-+ final ModifiableClassLoaderRepository loaders = AccessController.doPrivileged(new PrivilegedAction<ModifiableClassLoaderRepository>() {
-+
-+- @Override
-+ public ModifiableClassLoaderRepository run() {
-+ return instantiator.getClassLoaderRepository();
-+ }
-+diff -r b72e7b89dda9 src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
-+--- openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java Thu Sep 08 11:00:33 2011 -0700
-++++ openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java Thu May 12 16:39:37 2016 +0100
-+@@ -227,17 +227,14 @@
-+ allowedTypes = credentialsTypes;
-+ }
-+
-+- @Override
-+ public String getVersion() throws RemoteException {
-+ return impl.getVersion();
-+ }
-+
-+- @Override
-+ public RMIConnection newClient(Object credentials) throws IOException {
-+ return impl.newClient(credentials);
-+ }
-+
-+- @Override
-+ public void check(Method method, ObjectStreamClass descriptor,
-+ int paramIndex, int callID) {
-+
-+@@ -247,7 +244,6 @@
-+ }
-+ }
-+
-+- @Override
-+ public void checkProxyClass(Method method, String[] ifaces,
-+ int paramIndex, int callID) {
-+ if (ifaces != null && ifaces.length > 0) {
-+@@ -259,7 +255,6 @@
-+ }
-+ }
-+
-+- @Override
-+ public void end(int callID) {
-+ /* Do nothing */
-+ }
-diff -r c23ceebb80a1 -r 60be25a84f2d patches/openjdk/8014205-blank_swing_dialogs_windows.patch
---- a/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Sun May 08 21:28:21 2016 +0100
-+++ b/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Fri May 13 14:02:18 2016 +0100
-@@ -116,7 +116,7 @@
- {
- if (numBands == 3 && !ccm.hasAlpha()) {
- imageType = TYPE_3BYTE_BGR;
--@@ -804,6 +801,27 @@
-+@@ -804,6 +801,26 @@
- } // else if ((raster instanceof ByteComponentRaster) &&
- }
-
-@@ -129,7 +129,6 @@
- + new PrivilegedAction<Boolean>()
- + {
- +
--+ @Override
- + public Boolean run() {
- + final ClassLoader std = System.class.getClassLoader();
- +
-
generated by cgit v1.2.3 (git 2.45.2) at 2024-07-12 00:51:48 +0000