[sweethome3d] 03/04: Refresh patches.
Gabriele Giacone
gg0-guest at moszumanska.debian.org
Fri Oct 24 01:19:01 BST 2014
This is an automated email from the git hooks/post-receive script.
gg0-guest pushed a commit to branch master
in repository sweethome3d.
commit b3404f18f6f621d6b263b6bd4cea495ad84089be
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Fri Oct 24 01:03:48 2014 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00build.xml | 2 +-
debian/patches/01noMacOSX | 51 ++++++++++++++++++++++++++++++----------------
debian/patches/03novideo | 33 ++++++++++++++++--------------
debian/patches/04manifest | 2 +-
5 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 32c68d2..a66950c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
sweethome3d (4.5+dfsg-1) unstable; urgency=medium
* New upstream release.
+ * Refresh patches.
-- Gabriele Giacone <1o5g4r8o at gmail.com> Thu, 23 Oct 2014 00:55:27 +0200
diff --git a/debian/patches/00build.xml b/debian/patches/00build.xml
index 0de7676..bedf785 100644
--- a/debian/patches/00build.xml
+++ b/debian/patches/00build.xml
@@ -20,7 +20,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
</javac>
<!-- Copy resources excepted furniture, textures and help files -->
-@@ -438,7 +440,7 @@
+@@ -435,7 +437,7 @@
<echo message="deploy dir ready for ftp"/>
</target>
diff --git a/debian/patches/01noMacOSX b/debian/patches/01noMacOSX
index ffbd222..6a41ac6 100644
--- a/debian/patches/01noMacOSX
+++ b/debian/patches/01noMacOSX
@@ -4,59 +4,76 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
--- a/src/com/eteks/sweethome3d/tools/OperatingSystem.java
+++ b/src/com/eteks/sweethome3d/tools/OperatingSystem.java
-@@ -33,7 +33,7 @@ import java.util.Timer;
+@@ -33,7 +33,6 @@ import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
-import com.apple.eio.FileManager;
-+//import com.apple.eio.FileManager;
import com.eteks.sweethome3d.model.Home;
/**
-@@ -410,9 +410,10 @@ public class OperatingSystem {
+@@ -432,9 +431,12 @@ public class OperatingSystem {
*/
public static File getDefaultApplicationFolder() throws IOException {
File userApplicationFolder;
-- if (isMacOSX()) {
-+/* if (isMacOSX()) {
++/*
+ if (isMacOSX()) {
userApplicationFolder = new File(MacOSXFileManager.getApplicationSupportFolder());
-- } else if (isWindows()) {
-+ } else if (isWindows()) { */
+ } else if (isWindows()) {
++ */
+ if (isWindows()) {
userApplicationFolder = new File(System.getProperty("user.home"), "Application Data");
// If user Application Data directory doesn't exist, use user home
if (!userApplicationFolder.exists()) {
-@@ -433,10 +434,10 @@ public class OperatingSystem {
+@@ -455,10 +457,12 @@ public class OperatingSystem {
* This class requires some classes of <code>com.apple.eio</code> package
* to compile.
*/
-- private static class MacOSXFileManager {
-+/* private static class MacOSXFileManager {
++/*
+ private static class MacOSXFileManager {
public static String getApplicationSupportFolder() throws IOException {
// Find application support folder (0x61737570) for user domain (-32763)
return FileManager.findFolder((short)-32763, 0x61737570);
}
-- }
-+ } */
+ }
++ */
}
--- a/src/com/eteks/sweethome3d/SweetHome3D.java
+++ b/src/com/eteks/sweethome3d/SweetHome3D.java
-@@ -466,7 +466,6 @@ public class SweetHome3D extends HomeApp
+@@ -464,10 +464,12 @@ public class SweetHome3D extends HomeApp
+ // Too bad we can't retrieve homes to recover
+ ex.printStackTrace();
}
++/*
if (OperatingSystem.isMacOSX()) {
// Bind to application menu at last
-- MacOSXConfiguration.bindToApplicationMenu(this);
+ MacOSXConfiguration.bindToApplicationMenu(this);
}
++ */
// Run everything else in Event Dispatch Thread
+ EventQueue.invokeLater(new Runnable() {
+@@ -542,8 +544,7 @@ public class SweetHome3D extends HomeApp
+ && home.getName() == null
+ && !home.isRecovered()) {
+ if (OperatingSystem.isMacOSXLionOrSuperior()
+- && OperatingSystem.isJavaVersionGreaterOrEqual("1.7")
+- && MacOSXConfiguration.isWindowFullScreen(getHomeFrame(home))) {
++ && OperatingSystem.isJavaVersionGreaterOrEqual("1.7")) {
+ // Delay home disposal to avoid Java 3D fatal error
+ new Timer(3000, new ActionListener() {
+ public void actionPerformed(ActionEvent ev) {
--- a/src/com/eteks/sweethome3d/HomeFramePane.java
+++ b/src/com/eteks/sweethome3d/HomeFramePane.java
-@@ -123,7 +123,7 @@ public class HomeFramePane extends JRoot
+@@ -122,9 +122,11 @@ public class HomeFramePane extends JRoot
+ // Call setIconImage available in previous versions
homeFrame.setIconImage(frameImages.get(0));
}
++/*
if (OperatingSystem.isMacOSXLionOrSuperior()) {
-- MacOSXConfiguration.installToolBar(this);
-+// MacOSXConfiguration.installToolBar(this);
+ MacOSXConfiguration.installToolBar(this);
}
++ */
updateFrameTitle(homeFrame, this.home, this.application);
// Change component orientation
+ applyComponentOrientation(ComponentOrientation.getOrientation(Locale.getDefault()));
diff --git a/debian/patches/03novideo b/debian/patches/03novideo
index c69f334..e45f31d 100644
--- a/debian/patches/03novideo
+++ b/debian/patches/03novideo
@@ -3,28 +3,31 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
--- a/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
+++ b/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
-@@ -196,8 +196,8 @@ public interface ViewFactory {
+@@ -196,8 +196,10 @@ public interface ViewFactory {
/**
* Returns a new view able to compute a 3D video of a home.
*/
-- public abstract DialogView createVideoView(Home home, UserPreferences preferences,
-- VideoController videoController);
-+/* public abstract DialogView createVideoView(Home home, UserPreferences preferences,
-+ VideoController videoController); */
++/*
+ public abstract DialogView createVideoView(Home home, UserPreferences preferences,
+ VideoController videoController);
++ */
/**
* Returns a new view that displays Sweet Home 3D help.
--- a/src/com/eteks/sweethome3d/viewcontroller/VideoController.java
+++ b/src/com/eteks/sweethome3d/viewcontroller/VideoController.java
-@@ -99,7 +99,7 @@ public class VideoController implements
+@@ -98,9 +98,11 @@ public class VideoController implements
+ */
public DialogView getView() {
// Create view lazily only once it's needed
++/*
if (this.videoView == null) {
-- this.videoView = this.viewFactory.createVideoView(this.home, this.preferences, this);
-+// this.videoView = this.viewFactory.createVideoView(this.home, this.preferences, this);
+ this.videoView = this.viewFactory.createVideoView(this.home, this.preferences, this);
}
++ */
return this.videoView;
}
+
--- a/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
+++ b/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
@@ -58,7 +58,6 @@ import com.eteks.sweethome3d.viewcontrol
@@ -35,17 +38,17 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
import com.eteks.sweethome3d.viewcontroller.View;
import com.eteks.sweethome3d.viewcontroller.ViewFactory;
import com.eteks.sweethome3d.viewcontroller.WallController;
-@@ -298,11 +297,11 @@ public class SwingViewFactory implements
+@@ -298,11 +297,13 @@ public class SwingViewFactory implements
/**
* Returns a new view able to create 3D videos of the given home.
*/
-- public DialogView createVideoView(Home home,
-+/* public DialogView createVideoView(Home home,
++/*
+ public DialogView createVideoView(Home home,
UserPreferences preferences,
VideoController videoController) {
return new VideoPanel(home, preferences, videoController);
-- }
-+ } */
+ }
++ */
/**
* Returns a new view that displays Sweet Home 3D help.
@@ -62,7 +65,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
<!-- Copy resources excepted furniture, textures and help files -->
--- a/src/com/eteks/sweethome3d/swing/package.properties
+++ b/src/com/eteks/sweethome3d/swing/package.properties
-@@ -1052,8 +1052,8 @@ HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW
+@@ -1064,8 +1064,8 @@ HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW
HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW.ShortDescription=Create photos at stored points of view
HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW.MnemonicKey=C
@@ -75,7 +78,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
HomePane.CREATE_VIDEO.SmallIcon=resources/icons/tango/camera-video.png
--- a/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
+++ b/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
-@@ -316,7 +316,7 @@ public class HomeController implements C
+@@ -329,7 +329,7 @@ public class HomeController implements C
homeView.setEnabled(HomeView.ActionType.VIEW_FROM_OBSERVER, true);
homeView.setEnabled(HomeView.ActionType.MODIFY_3D_ATTRIBUTES, true);
homeView.setEnabled(HomeView.ActionType.CREATE_PHOTO, true);
diff --git a/debian/patches/04manifest b/debian/patches/04manifest
index 8e1fb42..4903fe1 100644
--- a/debian/patches/04manifest
+++ b/debian/patches/04manifest
@@ -3,7 +3,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
--- a/build.xml
+++ b/build.xml
-@@ -450,6 +450,7 @@
+@@ -447,6 +447,7 @@
<jar destfile="install/SweetHome3D-${version}.jar">
<manifest>
<attribute name="Main-Class" value="com.eteks.sweethome3d.SweetHome3DBootstrap"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git
More information about the pkg-java-commits
mailing list