From 1f01dca48ed45c0c2091c4a45981a18d93a4e0aa Mon Sep 17 00:00:00 2001
From: deepaksamuel <deepaksamuel@gmail.com>
Date: Wed, 22 Apr 2020 02:02:50 +0530
Subject: [PATCH] After Ubuntu 16.10 version, create-app modified pro file
 modified

---
 README                               |  15 +++++++++++++++
 deploy-tools/create-app              |  13 +++++++++++++
 deploy-tools/db.sqlite               | Bin 51200 -> 51200 bytes
 deploy-tools/install-g4-dependencies |  19 +++++++++++++++++++
 simple.pro                           |  11 ++++++++++-
 5 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 deploy-tools/install-g4-dependencies

diff --git a/README b/README
index e89eb94..814e12c 100644
--- a/README
+++ b/README
@@ -1,6 +1,21 @@
 Latest update:
 Run the create-app file: source create-app and the app is automatically created
 
+
+
+The following needs to be run before building Geant4 on a clean system (only if  you are building from the source):
+#install git
+sudo apt-get install git
+#install cmake
+sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main'
+sudo apt-get update
+sudo apt-get install cmake
+sudo apt-get install libxerces-c-dev
+sudo apt-get install qt5-default
+sudo apt-get install libxmu-dev
+
+
+
 //Old instructions:
 Download from https://github.com/linuxdeploy
 a) linuxdeploy
diff --git a/deploy-tools/create-app b/deploy-tools/create-app
index 7b1a82f..32da249 100644
--- a/deploy-tools/create-app
+++ b/deploy-tools/create-app
@@ -73,6 +73,19 @@ else
       cp -r $ROOTSYS/icons simple-app/usr
       cp -r $ROOTSYS/lib simple-app/usr
       cp -r $ROOTSYS/bin simple-app/usr
+
+      echo "If you see errors after h2root, then install gfortran: sudo apt-get install gfortran"
+      echo "If the ROOT binary is directly downloaded from the website, then the following removals are required!"
+      rm simple-app/usr/bin/proofd
+      rm simple-app/usr/lib/libNetxNG.so
+      rm simple-app/usr/lib/libNetx.so
+      rm simple-app/usr/lib/libProofx.so
+      rm simple-app/usr/lib/libXrdProofd.so
+      rm simple-app/usr/lib/libGenetic.so
+      rm simple-app/usr/lib/libTMVA.so
+      rm simple-app/usr/lib/libEGPythia8.so
+      rm simple-app/usr/lib/libTMVAGui.so
+
       	
 fi
 
diff --git a/deploy-tools/db.sqlite b/deploy-tools/db.sqlite
index 2dfc320272a7362794f4da743b091269b703c386..13a61db41b70b8ab933c1dfb2fc5bfa0f120fcd8 100644
GIT binary patch
delta 23
fcmZpez}zr_d4e>f)I=F)Rw)MEk2^M|%sCDKR_O>z

delta 23
fcmZpez}zr_d4e>f<U|=~R!Igu3yzH`bB+T5PZI{<

diff --git a/deploy-tools/install-g4-dependencies b/deploy-tools/install-g4-dependencies
new file mode 100644
index 0000000..360b7d9
--- /dev/null
+++ b/deploy-tools/install-g4-dependencies
@@ -0,0 +1,19 @@
+#!/bin/bash
+#install git
+sudo apt-get install git
+#install cmake
+sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main'
+sudo apt-get update
+sudo apt-get install cmake
+#install libxerces-c-dev
+sudo apt-get install libxerces-c-dev
+#install qt
+sudo apt-get install qt5-default
+#install libxmu-dev
+sudo apt-get install libxmu-dev
+
+#for ROOT 6.20
+sudo apt-get install libxpm-dev
+sudo apt-get install libxft-dev
+#install qtcreator
+sudo apt install qtcreator
diff --git a/simple.pro b/simple.pro
index 4e8e742..657b11e 100644
--- a/simple.pro
+++ b/simple.pro
@@ -142,7 +142,15 @@ message("Please run Qtcreator from the command line and make sure that ROOTSYS a
 #Geant4 settings
 QMAKE_CXXFLAGS+=$$system(geant4-config --cflags)
 LIBS+=$$system(geant4-config --libs)
+
+#for ubuntu 16
+#message("Using xerces-c-3.1 for Ubuntu 16. Please change this in the project file, if you are running another OS")
+#LIBS+= -L/usr/lib/x86_64-linux-gnu/ -lxerces-c-3.1
+
+#for ubuntu 19
+message("Using xerces-c-3.2 for Ubuntu 19. Please change this in the project file, if you are running another OS")
 LIBS+= -L/usr/lib/x86_64-linux-gnu/ -lxerces-c-3.2
+
 #ROOT settings
 LIBS+=$$system(root-config --glibs)
 QMAKE_CXXFLAGS+=$$system(root-config --cflags)
@@ -192,7 +200,8 @@ DISTFILES += \
     deploy-tools/models/cobalt-decay.sim \
     deploy-tools/models/cerenkov.sim \
     deploy-tools/models/bragg-peak.sim \
-    deploy-tools/models/ICAL2.sim
+    deploy-tools/models/ICAL2.sim \
+    deploy-tools/install-g4-dependencies
 
 RESOURCES += \
     resources.qrc