Merge pull request #4274 from DamienCassou/pharo-vm-update

Update Pharo VM

pkgs/development/pharo/vm/default.nix

@@ -1,11 +1,14 @@
 { stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "pharo-vm-core-i386-2014.06.25";
+
+  version = "2014.09.20";
+
+  name = "pharo-vm-core-i386-${version}";
   system = "x86_32-linux";
   src = fetchurl {
-    url = http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-2014.08.14.tar.bz2;
+    url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2";
-    md5 = "8e9e8dfde4f4bb69aac4590ecf82dd3b";
+    md5 = "f4183566aeeb7cb9d0d7832b4e40b573";
   };
 
   sources10Zip = fetchurl {
@@ -73,8 +76,6 @@ stdenv.mkDerivation rec {
     unzip ${sources30Zip} -d $prefix/lib/pharo-vm/
   '';
 
-  patches = [ patches/pharo-is-not-squeak.patch patches/fix-executable-name.patch patches/fix-cmake-root-directory.patch ];
- 
   buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib ];
 
   meta = {

pkgs/development/pharo/vm/patches/fix-cmake-root-directory.patch

@@ -1,84 +0,0 @@
-From: Damien Cassou <damien.cassou@gmail.com>
-Subject: Fix use of absolute paths in cmake files
-
-* build/directories.cmake
-* build/CMakeLists.txt
-* build/vm-sound-ALSA/CMakeLists.txt
-* build/vm-sound-null/CMakeLists.txt
-* build/vm-display-null/CMakeLists.txt
-* build/vm-display-X11/CMakeLists.txt
---- a/build/CMakeLists.txt
-+++ b/build/CMakeLists.txt
-@@ -71,7 +71,7 @@
- list(APPEND LINKLIBS m)
- list(APPEND LINKLIBS dl)
- list(APPEND LINKLIBS pthread)
--set(EXECUTABLE_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- add_subdirectory("vm-display-null")
- add_subdirectory("vm-display-X11")
- add_subdirectory("vm-sound-ALSA")
---- a/build/directories.cmake
-+++ b/build/directories.cmake
-@@ -1,12 +1,12 @@
--set(topDir "/builds/workspace/Pharo-vm-unix-sources/cog")
--set(buildDir "/builds/workspace/Pharo-vm-unix-sources/cog/build")
-+set(topDir "${CMAKE_SOURCE_DIR}/..")
-+set(buildDir "${CMAKE_SOURCE_DIR}/../build")
- set(thirdpartyDir "${buildDir}/thirdParty")
--set(platformsDir "/builds/workspace/Pharo-vm-unix-sources/cog/platforms")
--set(srcDir "/builds/workspace/Pharo-vm-unix-sources/cog/src")
-+set(platformsDir "${CMAKE_SOURCE_DIR}/../platforms")
-+set(srcDir "${CMAKE_SOURCE_DIR}/../src")
- set(srcPluginsDir "${srcDir}/plugins")
- set(srcVMDir "${srcDir}/vm")
- set(platformName "unix")
- set(targetPlatform ${platformsDir}/${platformName})
- set(crossDir "${platformsDir}/Cross")
- set(platformVMDir "${targetPlatform}/vm")
--set(outputDir "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(outputDir "${CMAKE_SOURCE_DIR}/../results")
---- a/build/vm-display-X11/CMakeLists.txt
-+++ b/build/vm-display-X11/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- list(APPEND LINKLIBS SM)
- list(APPEND LINKLIBS ICE)
- list(APPEND LINKLIBS GL)
---- a/build/vm-display-null/CMakeLists.txt
-+++ b/build/vm-display-null/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- target_link_libraries(vm-display-null ${LINKLIBS})
- set_target_properties(vm-display-null PROPERTIES PREFIX "" SUFFIX "" 
- 			LINK_FLAGS -m32)
---- a/build/vm-sound-ALSA/CMakeLists.txt
-+++ b/build/vm-sound-ALSA/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- target_link_libraries(vm-sound-ALSA ${LINKLIBS})
- set_target_properties(vm-sound-ALSA PROPERTIES PREFIX "" SUFFIX "" 
- 			LINK_FLAGS -m32)
---- a/build/vm-sound-null/CMakeLists.txt
-+++ b/build/vm-sound-null/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- target_link_libraries(vm-sound-null ${LINKLIBS})
- set_target_properties(vm-sound-null PROPERTIES PREFIX "" SUFFIX "" 
- 			LINK_FLAGS -m32)

pkgs/development/pharo/vm/patches/fix-executable-name.patch

@@ -1,14 +0,0 @@
-Change the name of the executable file from Squeak to Pharo
---- a/platforms/unix/vm-display-X11/sqUnixX11.c
-+++ b/platforms/unix/vm-display-X11/sqUnixX11.c
-@@ -153,8 +153,8 @@
- /*** Variables -- X11 Related ***/
- 
- /* name of Squeak windows in Xrm and the WM */
--#define xResClass	"Squeak"
--#define xResName	"squeak"
-+#define xResClass	"pharo-vm"
-+#define xResName	"Pharo"
- 
- char		*displayName= 0;	/* name of display, or 0 for $DISPLAY */
- Display		*stDisplay= null;	/* Squeak display */

pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch

@@ -1,23 +0,0 @@
-pharo --help must talk about Pharo and not about Squeak
---- a/platforms/unix/vm-display-X11/sqUnixX11.c
-+++ b/platforms/unix/vm-display-X11/sqUnixX11.c
-@@ -7075,8 +7075,8 @@
-   printf("  -lazy                 go to sleep when main window unmapped\n");
-   printf("  -mapdelbs             map Delete key onto Backspace\n");
-   printf("  -nointl               disable international keyboard support\n");
--  printf("  -notitle              disable the Squeak window title bar\n");
--  printf("  -title <t>            use t as the Squeak window title instead of the image name\n");
-+  printf("  -notitle              disable the Pharo window title bar\n");
-+  printf("  -title <t>            use t as the Pharo window title instead of the image name\n");
-   printf("  -ldtoms <n>           launch drop timeout milliseconds\n");
-   printf("  -noxdnd               disable X drag-and-drop protocol support\n");
-   printf("  -optmod <n>           map Mod<n> to the Option key\n");
-@@ -7095,7 +7095,7 @@
- static void display_printUsageNotes(void)
- {
-   printf("  Using `unix:0' for <dpy> may improve local display performance.\n");
--  printf("  -xshm only works when Squeak is running on the X server host.\n");
-+  printf("  -xshm only works when Pharo is running on the X server host.\n");
- }
- 
-