This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, master has been updated
via 054270ca0b9359b7f6e07764f789614d60554f79 (commit)
from 09ef820da646eb611ae3d5bf33c14ef41c4b0552 (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 -----------------------------------------------------------------
commit 054270ca0b9359b7f6e07764f789614d60554f79
Author: Niels Thykier <[email protected]>
Date: Tue Jan 26 16:06:49 2010 +0100
Imported patch from Fedora to fix seg. fault in libpango.
-----------------------------------------------------------------------
Summary of changes:
build.xml | 1 +
debian/changelog | 2 +
debian/patches/series | 1 +
debian/patches/swtbug291128.patch | 50 +++++++++++++++++++++++++++++++++++++
patches/swtbug291128.patch | 32 +++++++++++++++++++++++
5 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/build.xml b/build.xml
index 8245874..a537cb3 100644
--- a/build.xml
+++ b/build.xml
@@ -249,6 +249,7 @@
<patch
patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch"
dir="${buildDirectory}" strip="3" />
<patch
patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch"
dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
<chmod
dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build"
includes="*.sh" perm="a+x" />
+ <patch patchfile="${basedir}/patches/swtbug291128.patch"
dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT Accessibility"
strip="1" />
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch"
dir="${buildDirectory}" strip="1" />
<replace
file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties"
token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
<chmod
dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build"
includes="*.sh" perm="a+x" />
diff --git a/debian/changelog b/debian/changelog
index 987ef0e..d292610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,8 @@ eclipse (3.5.1+repack-1) UNRELEASED; urgency=low
- Rename our swt packages.
- Do not install conflicting symlinks/files.
(Closes: #541638, LP: #491880)
+ * Imported patch from Fedora that fixes seg. faults in libpango.
+ (LP: #445009)
-- Debian Orbital Alignment Team
<[email protected]> Tue, 01 Dec 2009 20:28:17 +0100
diff --git a/debian/patches/series b/debian/patches/series
index 26c98ca..a0fe6bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix-directory-in-eclipse-ini.patch
system-jars.patch
codec.patch
lucene.patch
+swtbug291128.patch
diff --git a/debian/patches/swtbug291128.patch
b/debian/patches/swtbug291128.patch
new file mode 100644
index 0000000..f9caafd
--- /dev/null
+++ b/debian/patches/swtbug291128.patch
@@ -0,0 +1,50 @@
+Description: Fixes upstream #291128
+Origin: Fedora
+
+--- a/patches/swtbug291128.patch 1969-12-31 19:00:00.000000000 -0500
++++ b/patches/swtbug291128.patch 2009-12-22 16:46:54.000000000 -0500
+@@ -0,0 +1,32 @@
++### Eclipse Workspace Patch 1.0
++#P org.eclipse.swt
++Index: Eclipse SWT
Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
++===================================================================
++RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT
Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java,v
++retrieving revision 1.46
++diff -u -r1.46 AccessibleObject.java
++--- Eclipse SWT
Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java 29 May
2009 21:30:30 -0000 1.46
+++++ Eclipse SWT
Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java 22 Dec
2009 17:05:15 -0000
++@@ -1176,7 +1176,12 @@
++ }
++
++ static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {
++- return (AccessibleObject)AccessibleObjects.get (new LONG
(atkObject));
+++ AccessibleObject object =
(AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
+++ if (object == null) return null;
+++ if (object.accessible == null) return null;
+++ Control control = object.accessible.control;
+++ if (control == null || control.isDisposed()) return null;
+++ return object;
++ }
++
++ AccessibleObject getChildByHandle (int /*long*/ handle) {
++@@ -1252,7 +1257,7 @@
++ GObjectClass objectClassStruct = new GObjectClass ();
++ ATK.memmove (objectClassStruct, gObjectClass);
++ ATK.call (objectClassStruct.finalize, atkObject);
++- AccessibleObject object = getAccessibleObject (atkObject);
+++ AccessibleObject object =
(AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
++ if (object != null) {
++ AccessibleObjects.remove (new LONG (atkObject));
++ object.release ();
+diff --git a/build.xml b/build.xml
+index 8245874..a537cb3 100644
+--- a/build.xml
++++ b/build.xml
+@@ -249,6 +249,7 @@
+ <patch
patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch"
dir="${buildDirectory}" strip="3" />
+ <patch
patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch"
dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
+ <chmod
dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build"
includes="*.sh" perm="a+x" />
++ <patch patchfile="${basedir}/patches/swtbug291128.patch"
dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT Accessibility"
strip="1" />
+ <patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch"
dir="${buildDirectory}" strip="1" />
+ <replace
file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties"
token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
+ <chmod
dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build"
includes="*.sh" perm="a+x" />
diff --git a/patches/swtbug291128.patch b/patches/swtbug291128.patch
new file mode 100644
index 0000000..9d43ee4
--- /dev/null
+++ b/patches/swtbug291128.patch
@@ -0,0 +1,32 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.swt
+Index: Eclipse SWT
Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT
Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java,v
+retrieving revision 1.46
+diff -u -r1.46 AccessibleObject.java
+--- Eclipse SWT
Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java 29 May
2009 21:30:30 -0000 1.46
++++ Eclipse SWT
Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java 22 Dec
2009 17:05:15 -0000
+@@ -1176,7 +1176,12 @@
+ }
+
+ static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {
+- return (AccessibleObject)AccessibleObjects.get (new LONG
(atkObject));
++ AccessibleObject object =
(AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
++ if (object == null) return null;
++ if (object.accessible == null) return null;
++ Control control = object.accessible.control;
++ if (control == null || control.isDisposed()) return null;
++ return object;
+ }
+
+ AccessibleObject getChildByHandle (int /*long*/ handle) {
+@@ -1252,7 +1257,7 @@
+ GObjectClass objectClassStruct = new GObjectClass ();
+ ATK.memmove (objectClassStruct, gObjectClass);
+ ATK.call (objectClassStruct.finalize, atkObject);
+- AccessibleObject object = getAccessibleObject (atkObject);
++ AccessibleObject object =
(AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
+ if (object != null) {
+ AccessibleObjects.remove (new LONG (atkObject));
+ object.release ();
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
