remove patch again

3 files changed, 4 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15e8b1166331..20318ad6b2eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = scribus-svn
 	pkgdesc = A desktop publishing program - Version from SVN
-	pkgver = 23064
+	pkgver = 23065
 	pkgrel = 1
 	url = http://www.scribus.net
 	arch = i686
@@ -30,10 +30,8 @@ pkgbase = scribus-svn
 	conflicts = scribus
 	source = scribus::svn://scribus.net/trunk
 	source = python2.patch
-	source = fix_typo.patch
 	sha256sums = SKIP
 	sha256sums = 1801f9b1fbabeee33112c48e706706072e1e60b1160b1723c9bb80df0b4e2c66
-	sha256sums = 25887019e8d4917375bec6399e5c8fac09a94eee5868bd287156c13ae2507e16
 
 pkgname = scribus-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index 79d75170dd37..6cd69e8af2b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=scribus-svn
-pkgver=23064
+pkgver=23065
 pkgrel=1
 pkgdesc="A desktop publishing program - Version from SVN"
 arch=('i686' 'x86_64')
@@ -17,10 +17,9 @@ makedepends=('subversion' 'cmake' 'qt5-tools')
 optdepends=('lib2geom: for mesh distortion')
 conflicts=('scribus')
 provides=('scribus')
-source=('scribus::svn://scribus.net/trunk' python2.patch fix_typo.patch)
+source=('scribus::svn://scribus.net/trunk' python2.patch)
 sha256sums=('SKIP'
-            '1801f9b1fbabeee33112c48e706706072e1e60b1160b1723c9bb80df0b4e2c66'
-            '25887019e8d4917375bec6399e5c8fac09a94eee5868bd287156c13ae2507e16')
+            '1801f9b1fbabeee33112c48e706706072e1e60b1160b1723c9bb80df0b4e2c66')
 _svnmod='scribus'
 
 pkgver() {
@@ -32,7 +31,6 @@ pkgver() {
 prepare() {
   cd $_svnmod/Scribus
   patch -Np1 < "$srcdir"/python2.patch || true
-  patch -Np1 < "$srcdir"/fix_typo.patch || true
 }
 
 build() {
diff --git a/fix_typo.patch b/fix_typo.patch
deleted file mode 100644
index 86c634a37b49..000000000000
--- a/fix_typo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Scribus/scribus/ui/osgeditor.cpp	(Revision 23064)
-+++ Scribus/scribus/ui/osgeditor.cpp	(Arbeitskopie)
-@@ -571,7 +571,7 @@
- void OSGEditorDialog::openFile()
- {
- 	QString fileName;
--	PrefsContext* dirs = PrefsManager::instance()->prefsFile->getContext("dirs");
-+	PrefsContext* dirs = PrefsManager::instance().prefsFile->getContext("dirs");
- 	QString wdir = dirs->get("models", ".");
- 	CustomFDialog dia(this, wdir, tr("Import 3-D Model"), filterString, fdHidePreviewCheckBox);
- 	if (dia.exec() == QDialog::Accepted)