Initial commit

Signed-off-by: JP-Ellis <josh@jpellis.me>

5 files changed, 164 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..6c10b8c40596
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,18 @@
+# Generated by mksrcinfo v8
+# Tue Feb 14 02:51:03 UTC 2017
+pkgbase = exrootanalysis
+	pkgdesc = A package designed to simplify ROOT tree production and analysis.
+	pkgver = 0.0.23
+	pkgrel = 1
+	url = https://cp3.irmp.ucl.ac.be/projects/ExRootAnalysis
+	arch = i686
+	arch = x86_64
+	license = GPL3
+	depends = root
+	source = exrootanalysis-r23.zip::https://cp3.irmp.ucl.ac.be/projects/ExRootAnalysis/changeset/23/trunk?old_path=%2F&format=zip
+	source = fix.patch
+	sha256sums = b30897ae035b741fa93f47e7cd5adc5f942d77498c143ef17ef4f1377207086e
+	sha256sums = 6147bc6c3018ff8c80f3ba60f75e210921e3f714fb35d83c40f47b0401df821c
+
+pkgname = exrootanalysis
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..048dd8b5f2d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+exrootanalysis*.zip
+*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..1af079ba0b7a
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: JP-Ellis <josh@jpellis.me>
+
+pkgname=exrootanalysis
+pkgver=0.0.23
+pkgrel=1
+pkgdesc="A package designed to simplify ROOT tree production and analysis."
+url="https://cp3.irmp.ucl.ac.be/projects/ExRootAnalysis"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('root')
+source=("${pkgname}-r${pkgver##*.}.zip::https://cp3.irmp.ucl.ac.be/projects/ExRootAnalysis/changeset/${pkgver##*.}/trunk?old_path=%2F&format=zip"
+        "fix.patch")
+sha256sums=('b30897ae035b741fa93f47e7cd5adc5f942d77498c143ef17ef4f1377207086e'
+            '6147bc6c3018ff8c80f3ba60f75e210921e3f714fb35d83c40f47b0401df821c')
+
+prepare() {
+    patch -p 1 < fix.patch
+}
+
+build() {
+    cd "trunk"
+    make
+}
+
+package() {
+    mkdir -p "${pkgdir}/usr/include"
+    cp -r "${srcdir}/trunk/ExRootAnalysis" "${pkgdir}/usr/include"
+    cp -r "${srcdir}/trunk/lib" "${pkgdir}/usr/"
+    cp "${srcdir}/trunk/tmp/src/ExRootAnalysisDict_rdict.pcm" "${pkgdir}/usr/lib/libExRootAnalysisDict_rdict.pcm"
+}
+
+# Local Variables:
+# mode: sh
+# End:
diff --git a/README.md b/README.md
new file mode 100644
index 000000000000..5eb7944733ee
--- /dev/null
+++ b/README.md
@@ -0,0 +1,13 @@
+ExRootAnalysis
+=======
+
+[![AUR badge][AUR badge]][AUR]
+
+ExRootAnalysis installer Arch Linux.
+
+[ExRootAnalysis][homepage] is a package designed to simplify ROOT tree production and analysis.
+
+
+[homepage]: https://cp3.irmp.ucl.ac.be/projects/ExRootAnalysis/
+[AUR]: https://aur.archlinux.org/packages/exrootanalysis/
+[AUR badge]: https://img.shields.io/aur/version/exrootanalysis.svg
diff --git a/fix.patch b/fix.patch
new file mode 100644
index 000000000000..0d39aac3ed99
--- /dev/null
+++ b/fix.patch
@@ -0,0 +1,97 @@
+diff --git a/trunk/test/ExRootLHCOlympicsConverter.cpp b/trunk/test/ExRootLHCOlympicsConverter.cpp
+index cb6ee65..c3ddf92 100644
+--- a/trunk/test/ExRootLHCOlympicsConverter.cpp
++++ b/trunk/test/ExRootLHCOlympicsConverter.cpp
+@@ -159,7 +159,7 @@ Long64_t LHCOlympicsConverter::GetNumberOfObjects(ifstream &inputFileStream)
+       fBufferStream.clear();

+       fBufferStream.str(fBuffer);

+       

+-      canReadNumber = (fBufferStream >> number);

++      canReadNumber = static_cast<bool>(fBufferStream >> number);

+     }

+     while(!canReadNumber);

+ 

+@@ -193,19 +193,19 @@ Bool_t LHCOlympicsConverter::ReadObject(ifstream &inputFileStream)
+ 

+     for(i = 0; canReadNumber && i < LHCOlympicsObject::maxIntParam; ++i)

+     {

+-      canReadNumber = (fBufferStream >> fCurrentObject.intParam[i]);

++      canReadNumber = static_cast<bool>(fBufferStream >> fCurrentObject.intParam[i]);

+     }

+     

+     if(canReadNumber && fCurrentObject.intParam[0] == 0)

+     {

+       fEventNumber = fCurrentObject.intParam[1];

+-      canReadNumber = (fBufferStream >> fTriggerWord);

++      canReadNumber = static_cast<bool>(fBufferStream >> fTriggerWord);

+     }

+     else

+     {

+       for(i = 0; canReadNumber && i < LHCOlympicsObject::maxDblParam; ++i)

+       {

+-        canReadNumber = (fBufferStream >> fCurrentObject.dblParam[i]);

++        canReadNumber = static_cast<bool>(fBufferStream >> fCurrentObject.dblParam[i]);

+       }

+     }

+   }

+diff --git a/trunk/test/LHEF.h b/trunk/test/LHEF.h
+index f58c764..e917629 100644
+--- a/trunk/test/LHEF.h
++++ b/trunk/test/LHEF.h
+@@ -534,7 +534,7 @@ protected:
+    * Used internally to read a single line from the stream.
+    */
+   bool getline() {
+-    return ( std::getline(file, currentLine) );
++    return static_cast<bool>( std::getline(file, currentLine) );
+   }
+ 
+ protected:
+diff --git a/trunk/test/MatchingSTDHEPConverter.cpp b/trunk/test/MatchingSTDHEPConverter.cpp
+index 06e9701..8a7d49d 100644
+--- a/trunk/test/MatchingSTDHEPConverter.cpp
++++ b/trunk/test/MatchingSTDHEPConverter.cpp
+@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
+ 
+   ofstream outputTextFile(argv[3], ios::out);
+ 
+-  if(outputTextFile == 0)
++  if(! outputTextFile)
+   {
+     cerr << "** ERROR: Can't open '" << argv[3] << "' for ouput" << endl;
+     return 1;
+diff --git a/trunk/test/MatchingTreeConverter.cpp b/trunk/test/MatchingTreeConverter.cpp
+index 0cf7c90..af52316 100644
+--- a/trunk/test/MatchingTreeConverter.cpp
++++ b/trunk/test/MatchingTreeConverter.cpp
+@@ -110,7 +110,7 @@ Long64_t MatchingTreeConverter::GetNumberOfObjects(ifstream &inputFileStream)
+       fBufferStream.clear();

+       fBufferStream.str(fBuffer);

+       

+-      canReadNumber = (fBufferStream >> number);

++      canReadNumber = static_cast<bool>(fBufferStream >> number);

+     }

+     while(!canReadNumber);

+ 

+@@ -144,7 +144,7 @@ Bool_t MatchingTreeConverter::ReadObject(ifstream &inputFileStream)
+ 

+     for(i = 0; canReadNumber && i < MatchingTreeObject::maxDblParam; ++i)

+     {

+-      canReadNumber = (fBufferStream >> fCurrentObject.dblParam[i]);

++      canReadNumber = static_cast<bool>(fBufferStream >> fCurrentObject.dblParam[i]);

+     }

+   }

+   while(!canReadNumber);

+diff --git a/trunk/Makefile.orig b/trunk/Makefile
+index d836fe4..43c7fb4 100644
+--- a/trunk/Makefile
++++ b/trunk/Makefile
+@@ -7,7 +7,7 @@
+ # multi-platform configuration is taken from ROOT (root/test/Makefile.arch)
+ #
+ 
+-include $(ROOTSYS)/test/Makefile.arch
++include /etc/Makefile.arch
+ 
+ ifeq ($(ARCH),macosx64)
+ UNDEFOPT = dynamic_lookup