This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository sweethome3d-furniture-editor.
commit f8cabfce17074b32fb5db8258030e56bf49e40a0 Author: Markus Koschany <[email protected]> Date: Sun Oct 9 23:10:20 2016 +0200 Add no-MacOS-support.patch and prevent a FTBFS due to unsupported Mac specific classes. --- debian/patches/build.patch | 2 +- debian/patches/no-MacOS-support.patch | 45 +++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/debian/patches/build.patch b/debian/patches/build.patch index 770f4da..7e701d9 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -12,7 +12,7 @@ Forwarded: not-needed 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/build.xml b/build.xml -index 09403bb..0698f32 100644 +index 09403bb..6b233a0 100644 --- a/build.xml +++ b/build.xml @@ -16,9 +16,11 @@ diff --git a/debian/patches/no-MacOS-support.patch b/debian/patches/no-MacOS-support.patch new file mode 100644 index 0000000..9f4fa7c --- /dev/null +++ b/debian/patches/no-MacOS-support.patch @@ -0,0 +1,45 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 9 Oct 2016 23:09:56 +0200 +Subject: no MacOS support + +--- + src/com/eteks/furniturelibraryeditor/FurnitureLibraryEditor.java | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/com/eteks/furniturelibraryeditor/FurnitureLibraryEditor.java b/src/com/eteks/furniturelibraryeditor/FurnitureLibraryEditor.java +index 662f6f7..7365e3a 100644 +--- a/src/com/eteks/furniturelibraryeditor/FurnitureLibraryEditor.java ++++ b/src/com/eteks/furniturelibraryeditor/FurnitureLibraryEditor.java +@@ -44,9 +44,6 @@ import javax.swing.KeyStroke; + import javax.swing.SwingUtilities; + import javax.swing.UIManager; + +-import com.apple.eawt.Application; +-import com.apple.eawt.ApplicationAdapter; +-import com.apple.eawt.ApplicationEvent; + import com.eteks.furniturelibraryeditor.io.FileFurnitureLibraryUserPreferences; + import com.eteks.furniturelibraryeditor.io.FurnitureLibraryFileRecorder; + import com.eteks.furniturelibraryeditor.model.FurnitureLibrary; +@@ -278,7 +275,6 @@ public class FurnitureLibraryEditor { + } + + if (OperatingSystem.isMacOSX()) { +- MacOSXConfiguration.bindToApplicationMenu(editorController); + } + + if (furnitureLibraryName != null) { +@@ -363,7 +359,6 @@ public class FurnitureLibraryEditor { + private static class MacOSXConfiguration { + /** + * Binds <code>controller</code> to Mac OS X application menu. +- */ + public static void bindToApplicationMenu(final EditorController controller) { + Application macosxApplication = Application.getApplication(); + // Add a listener to Mac OS X application that will call controller methods +@@ -409,5 +404,6 @@ public class FurnitureLibraryEditor { + } + } + } ++ */ + } + } diff --git a/debian/patches/series b/debian/patches/series index 5879227..38f95aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ build.patch +no-MacOS-support.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d-furniture-editor.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
