diff options
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/scribus-qobject.patch | 17 | ||||
| -rw-r--r-- | gnu/packages/scribus.scm | 5 |
3 files changed, 2 insertions, 21 deletions
diff --git a/gnu-system.am b/gnu-system.am index 6ccca125ce..20e38aeccb 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -702,7 +702,6 @@ dist_patch_DATA = \ gnu/packages/patches/sed-hurd-path-max.patch \ gnu/packages/patches/scheme48-tests.patch \ gnu/packages/patches/scotch-test-threading.patch \ - gnu/packages/patches/scribus-qobject.patch \ gnu/packages/patches/sdl-libx11-1.6.patch \ gnu/packages/patches/serf-comment-style-fix.patch \ gnu/packages/patches/serf-deflate-buckets-test-fix.patch \ diff --git a/gnu/packages/patches/scribus-qobject.patch b/gnu/packages/patches/scribus-qobject.patch deleted file mode 100644 index 91be932f1b..0000000000 --- a/gnu/packages/patches/scribus-qobject.patch +++ /dev/null @@ -1,17 +0,0 @@ -See upstream bug report: http://bugs.scribus.net/view.php?id=13102 - -scribus/sclayer.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp -index 502112b..4da7bd5 100644 ---- a/scribus/sclayer.cpp -+++ b/scribus/sclayer.cpp -@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place. -
- #include <QHash> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
- #include <QVector> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
-+#include <QObject>
- #include <QtAlgorithms>
-
- ScLayer::ScLayer(void)
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 864e5707d3..a06054bede 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -39,15 +39,14 @@ (define-public scribus (package (name "scribus") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/scribus/scribus-devel/" version "/scribus-" version ".tar.xz")) (sha256 (base32 - "0s4f9q2nyqrrv4wc1ddf2admkmf9m33wmwp73ba5b4vi29nydnx3")) - (patches (list (search-patch "scribus-qobject.patch"))))) + "0f2adwg58w37sdi3xrk8xqw486p3pcfjaypcsswjl76r2f3yd0hq")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no test target (inputs |