Remove config path override and fix version

3 files changed, 3 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 865574c53fe6..738d2fed9da3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = xournalpp-git
 	pkgdesc = Xournal++ is a handwriting Notetaking software with PDF annotation support. Supports Pen input like Wacom Tablets.
-	pkgver = 1.0.15.r715.g8f83a043
+	pkgver = nightly.r0.gb2453554
 	pkgrel = 1
 	url = https://github.com/xournalpp/xournalpp
-	install = xournalpp.install
 	arch = i686
 	arch = x86_64
 	arch = aarch64
@@ -24,4 +23,3 @@ pkgbase = xournalpp-git
 	sha256sums = SKIP
 
 pkgname = xournalpp-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 53ff1e2520e9..98a7dd44df83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname="xournalpp"
 pkgname="${_pkgname}-git"
 
-pkgver=1.0.15.r715.g8f83a043
+pkgver=nightly.r0.gb2453554
 pkgrel=1
 pkgdesc='Xournal++ is a handwriting Notetaking software with PDF annotation support. Supports Pen input like Wacom Tablets.'
 arch=('i686' 'x86_64' 'aarch64')
@@ -14,7 +14,6 @@ license=('GPL2')
 makedepends=('git' 'cmake' 'cppunit')
 depends=('texlive-bin' 'gtk3' 'poppler-glib' 'libxml2' 'portaudio' 'libsndfile' 'lua' 'libzip')
 conflicts=('xournalpp')
-install="xournalpp.install"
 source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git")
 sha256sums=('SKIP')
 
@@ -28,14 +27,9 @@ prepare() {
 }
 
 build() {
-	if [ -z "$XDG_CONFIG_HOME" ]; then
-		configdir=".config"
-	else
-		configdir="$(realpath --relative-to="$HOME" "$XDG_CONFIG_HOME")"
-	fi
 	cd "${srcdir}/${_pkgname}/build"
 
-	cmake -DCMAKE_INSTALL_PREFIX="/usr/" -DDEV_CONFIG_DIR="$configdir/xournalpp" -DENABLE_CPPUNIT=ON ..
+	cmake -DCMAKE_INSTALL_PREFIX="/usr/" -DENABLE_CPPUNIT=ON ..
         cmake --build . --target pot
         cmake --build . --target translations
 	cmake --build .
diff --git a/xournalpp.install b/xournalpp.install
deleted file mode 100644
index d2b75d77ff5a..000000000000
--- a/xournalpp.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-	:
-}
-
-post_upgrade() {
-	configs=$(find /home/ /root/ -maxdepth 2 -name ".xournalpp" 2> /dev/null)
-	if ! [ -z "$configs" ]; then
-		cat << EOF
-
-WARNING: Default config folder moved from \$HOME/.xournalpp to \$HOME/\$XDG_CONFIG_HOME/xournalpp (default .config)
-Found following config paths:
-EOF
-		echo "$configs"
-		echo
-	fi
-}
-
-post_remove() {
-	:
-}