Initial release

5 files changed, 104 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ebd418d2dc93..889fb94e0167 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,23 @@
 pkgbase = simulationcraft-git
 	pkgdesc = A tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm). Multi-player event-driven simulator written in C++ that models raid damage.
-	pkgver = 0
+	pkgver = r41567.1a5296ef4b
 	pkgrel = 1
-	url = http://code.google.com/p/simulationcraft
-	install = simulationcraft.install
+	url = https://github.com/simulationcraft/simc
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	makedepends = cmake
 	makedepends = git
-	makedepends = qt5-base
-	makedepends = qt5-webkit
-	conflicts = simcraft
-	conflicts = simcraft-data
-	conflicts = simcraft-gui
-	conflicts = simulationcraft
-	conflicts = simulationcraft-data
-	conflicts = simulationcraft-gui
-	source = simulationcraft::git+https://code.google.com/p/simulationcraft/
-	source = SimulationCraft.desktop
-	md5sums = SKIP
-	md5sums = 59f2d428f6c7ad8a3eee1ca615a5982a
-
-pkgname = simulationcraft-git
+	depends = qt5-webkit
 	depends = openssl
-	depends = simulationcraft-data-git=0
-
-pkgname = simulationcraft-gui-git
-	pkgdesc = A tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm). Multi-player event-driven simulator written in C++ that models raid damage.gui
-	depends = qt5-base
 	depends = qt5-webkit
-	depends = simulationcraft-git=0
+	depends = qt5-webengine
+	source = git+https://github.com/simulationcraft/simc.git
+	source = 0001-set-welcome-path.patch
+	source = SimulationCraft.desktop
+	sha256sums = SKIP
+	sha256sums = 618e5d13965b9093213ef2240e23a828870b07faac0908cb1978438501f9e43d
+	sha256sums = fa947aea5f33ca5c4724655cf10ef6a46ae6065ba910a9f509ff96f30497ee31
 
-pkgname = simulationcraft-data-git
+pkgname = simulationcraft-git
 
diff --git a/.gitignore b/.gitignore
index 86e4ed05430e..3e97e502bf11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 *.zip
 *.tar.xz
-pkg
-src
-simulationcraft
+simc/
+pkg/
+src/
+*.log*
+diff/
diff --git a/0001-set-welcome-path.patch b/0001-set-welcome-path.patch
new file mode 100644
index 000000000000..2b80ae707dfd
--- /dev/null
+++ b/0001-set-welcome-path.patch
@@ -0,0 +1,40 @@
+--- a/qt/sc_WelcomeTab.cpp	2019-09-05 11:14:00.167493391 +0200
++++ b/qt/sc_WelcomeTab.cpp	2019-09-05 11:28:01.960790040 +0200
+@@ -9,17 +9,7 @@
+ SC_WelcomeTabWidget_WebKit::SC_WelcomeTabWidget_WebKit( SC_MainWindow* parent ) :
+     SC_WebEngineView( parent )
+ {
+-  QString welcomeFile = "";
+-  for(const auto& path : SC_PATHS::getDataPaths())
+-  {
+-      QFile welcome_path(path + "/Welcome.html");
+-      if (welcome_path.exists())
+-      {
+-          welcomeFile = welcome_path.fileName();
+-          break;
+-      }
+-  }
+-  QString welcome_uri = "file:///" + welcomeFile;
++  QString welcome_uri = "file:///usr/share/simulationcraft-git/Welcome.html";
+   setUrl( welcome_uri );
+ 
+   page() -> setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
+@@ -39,17 +29,7 @@
+     welcome_uri(),
+     welcome_timer( new QTimer( this ) )
+ {
+-  QString welcomeFile("");
+-  for(const auto& path : SC_PATHS::getDataPaths())
+-  {
+-      QFile welcome_path(path + "/Welcome.html");
+-      if (welcome_path.exists())
+-      {
+-          welcomeFile = welcome_path.fileName();
+-          break;
+-      }
+-  }
+-  welcome_uri = "file:///" + welcomeFile;
++  welcome_uri = "file:///usr/share/simulationcraft-git/Welcome.html";
+   qDebug() << "welcome_uri: " << welcome_uri << "\n";
+ 
+   welcome_timer->setSingleShot( true );
diff --git a/PKGBUILD b/PKGBUILD
index 2e927a472eea..18cce980f0ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,94 +1,63 @@
-# Current maintainer: Samuel Kogler <firstname.lastname at gmail.com>
-# Original maintainer: Martin Weinelt <mweinelt@gmail.com>
-# Contributor: Bjoern Bidar <theodorstormgrade@gmail.com>
+# Maintainer: Samuel Kogler <firstname.lastname at gmail.com>
+
 _gui=true
+_pkgname=simc
+pkgver=r41567.1a5296ef4b
+pkgrel=1
 pkgbase=simulationcraft-git
 pkgname=simulationcraft-git
-pkgver=620.02.r1.g76dbaa9
-pkgrel=3
 pkgdesc="A tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm). Multi-player event-driven simulator written in C++ that models raid damage."
-url="http://code.google.com/p/simulationcraft"
+url="https://github.com/simulationcraft/simc"
 arch=('i686' 'x86_64')
 license=('GPL3')
-conflicts=('simcraft' 'simcraft-data' 'simcraft-gui' 'simulationcraft' 'simulationcraft-data' 'simulationcraft-gui')
-makedepends=('git')
-install=simulationcraft.install
-source=('simulationcraft::git+https://code.google.com/p/simulationcraft/'
+depends=('qt5-webkit' 'openssl' 'qt5-webkit' 'qt5-webengine')
+makedepends=('cmake' 'git')
+source=('git+https://github.com/simulationcraft/simc.git'
+        '0001-set-welcome-path.patch'
         'SimulationCraft.desktop')
-md5sums=('SKIP'
-         '9e52edb48f39888bc13a0b9bd5f8d758')
-
+sha256sums=('SKIP'
+            '618e5d13965b9093213ef2240e23a828870b07faac0908cb1978438501f9e43d'
+            'fa947aea5f33ca5c4724655cf10ef6a46ae6065ba910a9f509ff96f30497ee31')
 pkgver() {
-  cd "$srcdir/simulationcraft"
-  git describe --long --tags | sed 's/^release-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+    cd "${srcdir}/${_pkgname}/"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare()
-{
-  cd "$srcdir/simulationcraft"
-  # we don't want to build engine twice
-  if [ $_gui = true ] ; then
-    sed -e 's|SOURCES|OBJECTS|' -e 's|\.cpp|\.o|' -i source_files/QT_engine{,_main}.pri
-    qmake  INSTALLPATH=/usr/share/simulationcraft \
-      SHAREDIR=/usr/share/simulationcraft \
-      PREFIX=/usr \
-      CONFIG+='to_install' \
-      simcqt.pro -o Makefile
-  fi
-}
+prepare() {
+    cd "${srcdir}/${_pkgname}/"
+    patch -p1 < "${srcdir}/0001-set-welcome-path.patch"
 
-build()
-{
-  cd "$srcdir/simulationcraft/engine"
-  make PREFIX=/usr  CFLAGS+="$CFLAGS"  CXXFLAGS+="$CXXFLAGS" LDFLAGS+="$LDFLAGS"
-  if [ $_gui = true ] ; then
-    cd ..
-    make PREFIX=/usr CXXFLAGS+="$CXXFLAGS \$(DEFINES) -fPIC" LDFLAGS+="$LDFLAGS"
-  fi
+    mkdir -p build
+    cd build
+    cmake -DCMAKE_BUILD_TYPE=Release ..
 }
 
-package_simulationcraft-data-git()
-{
-  pkdesc+="data"
-  arch="any"
-  cd "$srcdir/simulationcraft"
-  for profile in $( find profiles -type f); do
-    install -Dm644 $profile   "$pkgdir/usr/share/simulationcraft/$profile"
-  done
+build() {
+    cd "${srcdir}/${_pkgname}/build/"
 
-  for doc in Welcome.html Welcome.png readme.txt; do
-    install -Dm644 $doc $pkgdir/usr/share/doc/simulationcraft/$doc
-  done
+    if [ ${_gui} = true ] ; then
+        make PREFIX=/usr CFLAGS+="${CFLAGS}" CXXFLAGS+="${CXXFLAGS}" LDFLAGS+="${LDFLAGS}"
+    else
+        make PREFIX=/usr CFLAGS+="${CFLAGS}" CXXFLAGS+="${CXXFLAGS}" LDFLAGS+="${LDFLAGS}" simc
+    fi
 }
 
-package_simulationcraft-git()
-{
-  depends=( 'openssl' "simulationcraft-data-git=$pkgver" )
-  cd "$srcdir/simulationcraft"
-  install -Dm755 engine/simc     "$pkgdir/usr/bin/simc"
-}
+package() {
+    cd "${srcdir}/${_pkgname}/"
 
-if [ $_gui = true ] ; then
-package_simulationcraft-gui-git()
-{
-  pkgdesc+="gui"
-  depends=( 'qt5-base' 'qt5-webkit' "simulationcraft-git=$pkgver")
-  cd "$srcdir/simulationcraft"
+    for profile in $( find profiles -type f); do
+        install -Dm644 "${profile}" "${pkgdir}/usr/share/${pkgname}/${profile}"
+    done
 
-  install -Dm644 qt/icon/SimulationCraft.xpm "$pkgdir/usr/share/pixmaps/SimulationCraft.xpm"
-  install -Dm644 "$srcdir/SimulationCraft.desktop" "$pkgdir/usr/share/applications/SimulationCraft.desktop"
-  for _locale in locale/* ; do
-    install -Dm644 $_locale  $pkgdir/usr/share/simulationcraft/$_locale
-  done
-  install -Dm755 SimulationCraft $pkgdir/usr/bin/simulationcraft
-  make install INSTALL_ROOT=$pkgdir
-  rm -rf $pkgdir/usr/share/simulationcraft
-}
-fi
+    install -Dm755 build/simc "${pkgdir}/usr/bin/simc-git"
+
+    install -Dm644 "Welcome.html" "${pkgdir}/usr/share/${pkgname}/Welcome.html"
+    install -Dm644 "Welcome.png" "${pkgdir}/usr/share/${pkgname}/Welcome.png"
 
-if [ $_gui = true ] ; then
-  makedepends+=( 'qt5-base' 'qt5-webkit')
-  true && pkgname=( simulationcraft-git simulationcraft-gui-git simulationcraft-data-git )
-else
-  true && pkgname=( simulationcraft-git  simulationcraft-data-git )
-fi
+    install -Dm644 qt/icon/SimulationCraft.xpm "${pkgdir}/usr/share/pixmaps/SimulationCraftGit.xpm"
+    install -Dm644 "${srcdir}/SimulationCraft.desktop" "${pkgdir}/usr/share/applications/SimulationCraftGit.desktop"
+    for _locale in locale/* ; do
+        install -Dm644 "${_locale}" "${pkgdir}/usr/share/${pkgname}/${_locale}"
+    done
+    install -Dm755 build/qt/SimulationCraft "${pkgdir}/usr/bin/${pkgname}"
+}
diff --git a/SimulationCraft.desktop b/SimulationCraft.desktop
index 997c3a7abb4a..bec6b467a7dd 100644
--- a/SimulationCraft.desktop
+++ b/SimulationCraft.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=SimulationCraft
+Name=SimulationCraftGit
 Comment=A tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm). Multi-player event-driven simulator written in C++ that models raid damage.
-Exec=simulationcraft
-Icon=SimulationCraft
+Exec=simulationcraft-git
+Icon=SimulationCraftGit
 Terminal=false
 Type=Application
 StartupNotify=true