Use string_new git branch

4 files changed, 42 insertions, 102 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 270e9fd7fc2a..41faf7ac87df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,31 @@
 pkgbase = xournalpp-git
-	pkgdesc = A C++ rewrite of tablet note-taking software Xournal - GTK3 branch
-	pkgver = 1.0.0.170.gc3c7c87
+	pkgdesc = C++ re-write of notetaking app Xournal - GIT version
+	pkgver = 1.0.0.290.gb62f922
 	pkgrel = 1
 	url = https://github.com/xournalpp/xournalpp
 	install = xournalpp.install
-	arch = x86_64
 	arch = i686
+	arch = x86_64
 	license = GPL3
 	makedepends = git
-	depends = gtk3
-	depends = openjpeg2
-	depends = libgnomecanvas>=2.30.1
-	depends = ghostscript
-	depends = shared-mime-info
-	depends = poppler-glib>=0.14.0
-	depends = hicolor-icon-theme
-	depends = desktop-file-utils
-	provides = xournalpp=1.0.0.170.gc3c7c87
-	provides = xournalpp-gtk3=1.0.0.170.gc3c7c87
-	provides = xournal-gtk3
-	provides = xournal
-	conflicts = xournalpp
-	conflicts = xournalpp-gtk3
-	conflicts = xournal-gtk3
+	makedepends = cmake
+	makedepends = gettext
+	makedepends = boost
+	depends = gtk2
+	depends = boost-libs
+	depends = glib2
+	depends = libglade
+	depends = poppler-glib
+	depends = glibmm
+	provides = xournal=1.0.0.290.gb62f922
+	provides = xournal-dmgerman=1.0.0.290.gb62f922 xournalpp=1.0.0.290.gb62f922
 	conflicts = xournal
-	options = !strip
-	options = zipman
-	options = docs
-	options = !emptydirs
-	source = xournalpp::git+https://github.com/xournalpp/xournalpp.git#branch=gtk3
-	source = xournalpp_fix_libopenjpeg.patch
+	conflicts = xournalpp
+	conflicts = xournal-dmgerman
+	conflicts = xournal-image-patched
+	conflicts = xournalpp-svn
+	source = xournalpp::git+https://github.com/xournalpp/xournalpp.git#branch=string_new
 	sha1sums = SKIP
-	sha1sums = e6a219270d550200331389c8010641c8902e8e84
 
 pkgname = xournalpp-git
 
diff --git a/.gitignore b/.gitignore
index 49bbdd6a2b7d..cbdfab6afa93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 src/
 pkg/
+*.pkg.tar*
 *.tar.xz
 *.tar.gz
-*.pkg.tar*
 *.zip
 *.sig
 *.log*
diff --git a/PKGBUILD b/PKGBUILD
index b6d7eced2dfb..9f50ce88a429 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,47 @@
-# Maintainer : Keshav Amburay <(the ddoott ridikulusddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Robert Orzanna <orschiro@googlemail.com>
-
 _pkgname="xournalpp"
 pkgname="${_pkgname}-git"
 
-pkgver=1.0.0.170.gc3c7c87
+pkgver=1.0.0.290.gb62f922
 pkgrel=1
-pkgdesc="A C++ rewrite of tablet note-taking software Xournal - GTK3 branch"
-arch=('x86_64' 'i686')
+pkgdesc="C++ re-write of notetaking app Xournal - GIT version"
+arch=('i686' 'x86_64')
 url="https://github.com/xournalpp/xournalpp"
 license=('GPL3')
-makedepends=('git')
-depends=('gtk3' 'openjpeg2' 'libgnomecanvas>=2.30.1' 'ghostscript' 'shared-mime-info' 'poppler-glib>=0.14.0' 'hicolor-icon-theme' 'desktop-file-utils')
-conflicts=("${_pkgname}" "${_pkgname}-gtk3" 'xournal-gtk3' 'xournal')
-provides=("${_pkgname}=${pkgver}" "${_pkgname}-gtk3=${pkgver}" 'xournal-gtk3' 'xournal')
-options=('!strip' 'zipman' 'docs' '!emptydirs')
-install="${_pkgname}.install"
-
-source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git#branch=gtk3"
-        'xournalpp_fix_libopenjpeg.patch')
-
-sha1sums=('SKIP'
-          'e6a219270d550200331389c8010641c8902e8e84')
+makedepends=('git' 'cmake' 'gettext' 'boost')
+depends=('gtk2' 'boost-libs' 'glib2' 'libglade' 'poppler-glib' 'glibmm')
+provides=("xournal=${pkgver}" "xournal-dmgerman=${pkgver} xournalpp=${pkgver}")
+conflicts=('xournal' 'xournalpp' 'xournal-dmgerman' 'xournal-image-patched' 'xournalpp-svn')
+install="xournalpp.install"
+source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git#branch=string_new")
+sha1sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${_pkgname}/"
-	echo "$(git describe --tags)" | sed -e 's|glib-||g' -e 's|-|.|g' -e 's|^v||g'
+  cd "${srcdir}/${_pkgname}/"
+  git describe --tags | sed -e 's|v||g' -e 's|glib.||g' -e 's|-|.|g'
 }
 
 prepare() {
 	
-	rm -rf "${srcdir}/${_pkgname}_build/" || true
-	cp -r "${srcdir}/${_pkgname}" "${srcdir}/${_pkgname}_build"
-	
-	cd "${srcdir}/${_pkgname}_build/"
+	cd "${srcdir}/${_pkgname}/"
 	
-	git clean -x -d -f
-	echo
+	rm -rf "${srcdir}/${_pkgname}/build" || true
+	mkdir -p "${srcdir}/${_pkgname}/build"
+	cd "${srcdir}/${_pkgname}/build"
 	
-	msg "Apply libopenjpeg fixes"
-	## https://github.com/xournalpp/xournalpp/wiki/Arch-20131101
-	patch -Np1 -i "${srcdir}/xournalpp_fix_libopenjpeg.patch"
-	echo
+	cmake ..
 	
 }
 
 build() {
-	
-	cd "${srcdir}/${_pkgname}_build/"
-	
-	libtoolize
-	autoreconf
-	echo
-	
-	./configure --prefix=/usr --enable-mathtex --enable-libopenjpeg
-	echo
-	
+	cd "${srcdir}/${_pkgname}/build"
 	make
 	echo
-	
 }
 
 package() {
+	cd "${srcdir}/${_pkgname}/build"
 	
-	cd "${srcdir}/${_pkgname}_build/"
-	make DESTDIR="${pkgdir}" install desktop-install
-	
+	sed 's|/usr/local|/usr|g' -i "${srcdir}/${_pkgname}/build/cmake_install.cmake" || true
+	make DESTDIR="${pkgdir}/" install
+	echo
 }
diff --git a/xournalpp_fix_libopenjpeg.patch b/xournalpp_fix_libopenjpeg.patch
deleted file mode 100644
index 8945ff90ad75..000000000000
--- a/xournalpp_fix_libopenjpeg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c4c6f56..5bb9223 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -100,12 +100,7 @@ AC_ARG_ENABLE(libopenjpeg,
- 	                     [Will not build against libopenjpeg.]),
-               enable_libopenjpeg=$enableval,
-               enable_libopenjpeg="try")
--if test x$enable_libopenjpeg = xyes; then
--  AC_CHECK_LIB([openjpeg], [opj_cio_open],,
--	       AC_MSG_ERROR("*** libopenjpeg library not found ***"))
--  AC_CHECK_HEADERS([openjpeg.h],,
--		   AC_MSG_ERROR("*** libopenjpeg headers not found ***"))
--elif test x$enable_libopenjpeg = xtry; then
-+if test x$enable_libopenjpeg = xtry; then
-   AC_CHECK_LIB([openjpeg], [opj_cio_open],
-                [enable_libopenjpeg="yes"],
- 	       [enable_libopenjpeg="no"])
-diff --git a/src/pdf/popplerdirect/workaround/workaround.sh.in b/src/pdf/popplerdirect/workaround/workaround.sh.in
-index fa8e9c5..a273b32 100644
---- a/src/pdf/popplerdirect/workaround/workaround.sh.in
-+++ b/src/pdf/popplerdirect/workaround/workaround.sh.in
-@@ -56,7 +56,7 @@ build()
- 
-   cd "${poppler_builddir}"
- 
--  "${poppler_srcdir}/configure" --enable-cms --enable-libopenjpeg="${enable_libopenjpeg}" --enable-libjpeg
-+  "${poppler_srcdir}/configure" --enable-cms --enable-libopenjpeg --disable-libjpeg
- 
-   make
-