[jabref] 04/06: Revert "remove 040_disable_macadapter.patch"

Tony Mancill tmancill at moszumanska.debian.org
Sat Dec 17 07:18:27 UTC 2016


This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch dev
in repository jabref.

commit f82a203112e2bee738dac2764dbf68ceee849574
Author: tony mancill <tmancill at debian.org>
Date:   Fri Dec 16 23:09:25 2016 -0800

    Revert "remove 040_disable_macadapter.patch"
    
    This reverts commit 5b67624ad5281cbda82b7a1a604fcd663e78b5d1.
---
 debian/patches/040_disable_macadapter.patch | 49 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 50 insertions(+)

diff --git a/debian/patches/040_disable_macadapter.patch b/debian/patches/040_disable_macadapter.patch
new file mode 100644
index 0000000..a15100c
--- /dev/null
+++ b/debian/patches/040_disable_macadapter.patch
@@ -0,0 +1,49 @@
+Description: disable OSX-specific functionality for building on Debian
+Author: tony mancill <tmancill at debian.org>
+Forwarded: not-needed
+
+--- a/src/main/java/osx/macadapter/MacAdapter.java
++++ b/src/main/java/osx/macadapter/MacAdapter.java
+@@ -1,5 +1,5 @@
+ package osx.macadapter;
+-
++/*
+ import java.io.File;
+ import java.util.List;
+ 
+@@ -18,7 +18,10 @@
+ import com.apple.eawt.PreferencesHandler;
+ import com.apple.eawt.QuitHandler;
+ import com.apple.eawt.QuitResponse;
++*/
+ 
++public class MacAdapter {
++/*
+ public class MacAdapter implements PreferencesHandler, AboutHandler, QuitHandler, OpenFilesHandler, AppReOpenedListener {
+ 
+     private JabRefFrame parentFrame;
+@@ -82,4 +85,5 @@
+     public void appReOpened(AppEvent.AppReOpenedEvent appReOpenedEvent) {
+         parentFrame.setVisible(true);
+     }
++*/
+ }
+--- a/src/main/java/net/sf/jabref/gui/JabRefFrame.java
++++ b/src/main/java/net/sf/jabref/gui/JabRefFrame.java
+@@ -663,6 +663,8 @@
+         //Note: The registration of Apple event is at the end of initialization, because
+         //if the events happen too early (ie when the window is not initialized yet), the
+         //opened (double-clicked) documents are not displayed.
++
++        /* Debian: not applicable
+         if (OS.OS_X) {
+             try {
+                 new MacAdapter().registerMacEvents(this);
+@@ -670,6 +672,7 @@
+                 LOGGER.fatal("Could not interface with Mac OS X methods.", e);
+             }
+         }
++        */
+ 
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 63a14ad..7728069 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@
 010_gradle_build.patch
 020_disable_automatic_upgrade_check.patch
 030_xjc.patch
+040_disable_macadapter.patch
 050_unirest_json.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git



More information about the pkg-java-commits mailing list