Updated PKGBUILD

3 files changed, 15 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8700909..c6c9235 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1.0)
 project(smolbote)
 
 # Options
-option(UseLibCpp "Use libc++ over stdlibc++" OFF)
+option(UseLibCpp "Use libc++ over stdlibc++ (requires clang)" OFF)
 
 # Libraries
 find_package(Qt5Core REQUIRED)
@@ -90,7 +90,7 @@ add_executable(poi ${SourceCode})
 target_include_directories(poi PRIVATE src lib)
 
 target_link_libraries(poi Qt5::Core Qt5::Widgets Qt5::WebEngineWidgets)
-target_link_libraries(poi config++ configuration)
+target_link_libraries(poi configuration)
 target_link_libraries(poi bookmarks downloads navigation)
 
 install(TARGETS poi DESTINATION bin CONFIGURATIONS Release)
diff --git a/lib/settings/CMakeLists.txt b/lib/settings/CMakeLists.txt
index 704c40f..983e8ca 100644
--- a/lib/settings/CMakeLists.txt
+++ b/lib/settings/CMakeLists.txt
@@ -7,4 +7,4 @@ add_library(configuration
         settingsdialog.h
         settingsdialog.ui)
 
-target_link_libraries(configuration Qt5::Widgets)
\ No newline at end of file
+target_link_libraries(configuration config++ Qt5::Widgets)
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index 69cea4b..89206d3 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -10,30 +10,32 @@ arch=('x86_64')
 license=('GPL3')
 
 depends=('qt5-base' 'qt5-webengine')
-makedepends=('git' 'qt5-tools' 'cmake' 'libconfig' 'pkg-config')
+makedepends=('git' 'cmake' 'libconfig' 'pkg-config')
 
-source=("git+git://neueland.iserlohn-fortress.net/smolbote.git")
+source=("smolbote-git::git+git://neueland.iserlohn-fortress.net/smolbote.git")
 sha512sums=('SKIP')
 
-prepare() {
-    # any patches go here
-}
+# any patches go here
+#prepare() {
+#}
 
 pkgver() {
-    cd smolbote
+    cd smolbote-git
     echo "$(git describe --long --tags | tr - .)"
 }
 
 build() {
+    rm -rf "$pkgname-$pkgver"
+    mkdir "$pkgname-$pkgver"
     cd "$pkgname-$pkgver"
 
     # Generate a makefile
     # Adjust the install prefix as necessary, default is /usr/local/bin
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local "$srcdir"
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local "$srcdir/smolbote-git"
 
     # Use this if you want to link with libc++ instead
-    # This requires clang, since gcc doesn't understand the concept of not using GPL software
-    #cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DUseLibCpp=On "$srcdir"
+    # This requires clang, since gcc doesn't understand the concept of not using libstdc++
+    #cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DUseLibCpp=On "$srcdir/smolbote-git"
 
     # build, with 4 threads
     make -j 4
@@ -41,5 +43,5 @@ build() {
 
 package() {
     cd "$pkgname-$pkgver"
-    make install
+    make DESTDIR="$pkgdir/" install
 }