Smoothing

3 files changed, 1 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 398763d720ff..d7af8a9f3cb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,12 +28,10 @@ pkgbase = psi-plus-git
 	conflicts = psi-plus-webkit-git
 	source = git://github.com/psi-plus/psi-plus-snapshots
 	source = git://github.com/psi-plus/main.git
-	source = conf.diff
 	source = join.patch
 	source = no-qca-qt4.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 690770c7c8976d536d8c4078d01c28f187f510574ddffe91251f5045fa672e53
 	sha256sums = ea25a58c7efe25979b8d257598608187380e8f35ace25e96cab9c357dcdbc974
 	sha256sums = a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23
 
diff --git a/PKGBUILD b/PKGBUILD
index 3d3ca451fc52..80c4d514a9f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,12 +17,10 @@ provides=("psi-plus=$pkgver" "psi-plus-qt5-git=$pkgver")
 conflicts=('psi-plus' 'psi-plus-qt5-git' 'psi-plus-webkit-qt5-git' 'psi-plus-webkit-git')
 source=("git://github.com/psi-plus/psi-plus-snapshots"
 	"git://github.com/psi-plus/main.git"
-	'conf.diff'
 	'join.patch'
 	'no-qca-qt4.patch')
 sha256sums=('SKIP'
             'SKIP'
-            '690770c7c8976d536d8c4078d01c28f187f510574ddffe91251f5045fa672e53'
             'ea25a58c7efe25979b8d257598608187380e8f35ace25e96cab9c357dcdbc974'
             'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23')
 
@@ -34,13 +32,8 @@ pkgver() {
             
 prepare() {
   cd psi-plus-snapshots
-  # make build date in --version output a bit more readable
-  # sed "s/yyyyMMdd/yyyy-MM-dd/" -i qcm/conf.qcm
-  # mkdir -p iconsets
-  # cp -r "$srcdir"/main/iconsets/* ./iconsets
-  # echo "$pkgver ($(date +"%Y-%m-%d"))" >version
   patch -p1 <"$srcdir"/join.patch
-  # patch -Np1 -i "${srcdir}/no-qca-qt4.patch"
+  patch -p1 <"$srcdir"/no-qca-qt4.patch
 }
 
 build() {
diff --git a/conf.diff b/conf.diff
deleted file mode 100644
index 2b58af1a3cf2..000000000000
--- a/conf.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.old	2016-04-16 16:10:54.312012000 +0300
-+++ configure	2016-04-16 16:11:15.062012000 +0300
-@@ -994,7 +994,8 @@
- 			conf->addIncludePath(inc);
- 		}
- 		conf->addLib(libs);
--
-+		conf->addExtra("CONFIG += psi-minizip");
-+		return true;
- #ifdef Q_OS_WIN
- 		// HACK: on windows, always use psi's bundled minizip
- 		conf->addExtra("CONFIG += psi-minizip");