diff options
| author | haawda | 2018-04-04 18:19:57 +0200 |
|---|---|---|
| committer | haawda | 2018-04-04 18:19:57 +0200 |
| commit | 3231d27c9f4af38f1586a05e9b79e4210462b98d (patch) | |
| tree | 6c2f266e9449459137e35853f4b5192153bd9feb | |
| parent | e4a040ae67be8220f774fab6221cf8f80e310a0c (diff) | |
| download | aur-3231d27c9f4af38f1586a05e9b79e4210462b98d.tar.gz | |
remove patch for icu, upstream fixed it in another way
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | icu_fix.patch | 9 |
3 files changed, 5 insertions, 19 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Apr 1 05:54:58 UTC 2018 +# Wed Apr 4 16:19:12 UTC 2018 pkgbase = scribus-svn pkgdesc = A desktop publishing program - Version from SVN - pkgver = 22461 + pkgver = 22463 pkgrel = 1 url = http://www.scribus.net arch = i686 @@ -32,10 +32,8 @@ pkgbase = scribus-svn conflicts = scribus source = scribus::svn://scribus.net/trunk source = python2.patch - source = icu_fix.patch md5sums = SKIP md5sums = 98b93cecd7b87a3b1425d2e483cd0a05 - md5sums = 90b5e597dc5723a659048b288a6680b0 pkgname = scribus-svn @@ -3,7 +3,7 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=scribus-svn -pkgver=22461 +pkgver=22463 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 icu_fix.patch) +source=('scribus::svn://scribus.net/trunk' python2.patch) md5sums=('SKIP' - '98b93cecd7b87a3b1425d2e483cd0a05' - '90b5e597dc5723a659048b288a6680b0') + '98b93cecd7b87a3b1425d2e483cd0a05') _svnmod='scribus' pkgver() { @@ -32,8 +31,6 @@ pkgver() { prepare() { cd $_svnmod patch -Np1 < "$srcdir"/python2.patch || true - cd Scribus - patch -Np0 < "$srcdir"/icu_fix.patch || true } build() { diff --git a/icu_fix.patch b/icu_fix.patch deleted file mode 100644 index 4a44385223ef..000000000000 --- a/icu_fix.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- CMakeLists.txt (revision 22461) -+++ CMakeLists.txt (working copy) -@@ -926,5 +926,6 @@ - # CTL support - pkg_check_modules(HARFBUZZ REQUIRED harfbuzz>=0.9.42 harfbuzz-icu) - pkg_check_modules(ICU REQUIRED icu-uc) -+add_definitions(-DU_USING_ICU_NAMESPACE=1) - - |