From 9fb0fb0616581cd4388c2d981a9802b1c582c015 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 10 Jul 2017 22:35:22 +0200 Subject: kde-frameworks/syntax-highlighting: Fix tests Reported-by: Kent Fredric Gentoo-bug: 624438 Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- .../files/syntax-highlighting-5.36.0-tests.patch | 335 +++++++++++++++++++++ .../syntax-highlighting-5.36.0.ebuild | 2 + 2 files changed, 337 insertions(+) create mode 100644 kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.36.0-tests.patch (limited to 'kde-frameworks/syntax-highlighting') diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.36.0-tests.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.36.0-tests.patch new file mode 100644 index 000000000000..f96562471983 --- /dev/null +++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.36.0-tests.patch @@ -0,0 +1,335 @@ +From 7c861d948f766f9624a13d0ee7af03ba9d4cef48 Mon Sep 17 00:00:00 2001 +From: Dominik Haumann +Date: Mon, 10 Jul 2017 22:01:42 +0200 +Subject: Haskell: fix unit tests + +BUG: 382169 +--- + autotests/folding/highlight.hs.fold | 10 ++ + autotests/html/highlight.hs.html | 10 ++ + autotests/reference/highlight.hs.ref | 4 +- + data/syntax/haskell.xml | 198 +++++++++++++++++------------------ + 4 files changed, 121 insertions(+), 101 deletions(-) + +diff --git a/autotests/folding/highlight.hs.fold b/autotests/folding/highlight.hs.fold +index 4aa90e2..9b41478 100644 +--- a/autotests/folding/highlight.hs.fold ++++ b/autotests/folding/highlight.hs.fold +@@ -122,3 +122,13 @@ RealFrac, Real, Show + -- data constructors + + EQ, False, GT, Just, LT, Left, Nothing, Right, True ++ ++-- pragma with compiler flags ++ ++{-# OPTIONS_GHC -fno-warn-orphans #-} ++ ++-- multiline pragma with language extensions ++ ++{-# LANGUAGE OverlappingInstances, ++ BangPatterns ++#-} +diff --git a/autotests/html/highlight.hs.html b/autotests/html/highlight.hs.html +index 0551dc0..664d9f4 100644 +--- a/autotests/html/highlight.hs.html ++++ b/autotests/html/highlight.hs.html +@@ -128,4 +128,14 @@ justtesting'' 9 -- data constructors + + EQ, False, GT, Just, LT, Left, Nothing, Right, True ++ ++-- pragma with compiler flags ++ ++{-# OPTIONS_GHC -fno-warn-orphans #-} ++ ++-- multiline pragma with language extensions ++ ++{-# LANGUAGE OverlappingInstances, ++ BangPatterns ++#-} + +diff --git a/autotests/reference/highlight.hs.ref b/autotests/reference/highlight.hs.ref +index cc05ebf..5b9a108 100644 +--- a/autotests/reference/highlight.hs.ref ++++ b/autotests/reference/highlight.hs.ref +@@ -130,5 +130,5 @@ + -- multiline pragma with language extensions
+
+ {-# LANGUAGE OverlappingInstances,
+- BangPatterns
+-#-}
++ BangPatterns
++#-}
+diff --git a/data/syntax/haskell.xml b/data/syntax/haskell.xml +index d0fa213..e5d54bd 100644 +--- a/data/syntax/haskell.xml ++++ b/data/syntax/haskell.xml +@@ -1,6 +1,6 @@ + + +- ++ + + + case +@@ -335,124 +335,124 @@ + hiding + + +- OverlappingInstances +- UndecidableInstances +- IncoherentInstances ++ AllowAmbiguousTypes ++ ApplicativeDo ++ Arrows ++ AutoDeriveTypeable ++ BangPatterns ++ BinaryLiterals ++ CApiFFI ++ CPP ++ ConstrainedClassMethods ++ ConstraintKinds ++ DataKinds ++ DatatypeContexts ++ DefaultSignatures ++ DeriveAnyClass ++ DeriveDataTypeable ++ DeriveFoldable ++ DeriveFunctor ++ DeriveGeneric ++ DeriveLift ++ DeriveTraversable ++ DisambiguateRecordFields ++ DoAndIfThenElse + DoRec +- RecursiveDo +- ParallelListComp +- MultiParamTypeClasses +- MonomorphismRestriction +- FunctionalDependencies +- Rank2Types +- RankNTypes +- PolymorphicComponents ++ DuplicateRecordFields ++ EmptyCase ++ EmptyDataDecls + ExistentialQuantification +- ScopedTypeVariables +- PatternSignatures +- ImplicitParams ++ ExplicitForAll ++ ExplicitNamespaces ++ ExtendedDefaultRules ++ ExtensibleRecords + FlexibleContexts + FlexibleInstances +- EmptyDataDecls +- CPP +- KindSignatures +- BangPatterns +- TypeSynonymInstances +- TemplateHaskell + ForeignFunctionInterface +- Arrows +- Generics +- ImplicitPrelude +- NamedFieldPuns +- PatternGuards ++ FunctionalDependencies ++ GADTSyntax ++ GADTs ++ GHCForeignImportPrim + GeneralizedNewtypeDeriving +- ExtensibleRecords +- RestrictedTypeSynonyms ++ Generics + HereDocuments +- MagicHash +- TypeFamilies +- StandaloneDeriving +- UnicodeSyntax +- UnliftedFFITypes ++ ImplicitParams ++ ImplicitPrelude ++ ImpredicativeTypes ++ IncoherentInstances ++ InstanceSigs + InterruptibleFFI +- CApiFFI ++ JavaScriptFFI ++ KindSignatures ++ LambdaCase + LiberalTypeSynonyms +- TypeOperators +- RecordWildCards +- RecordPuns +- DisambiguateRecordFields +- TraditionalRecordSyntax +- OverloadedStrings +- GADTs +- GADTSyntax ++ MagicHash ++ MonadComprehensions ++ MonadFailDesugaring ++ MonoLocalBinds + MonoPatBinds +- RelaxedPolyRec +- ExtendedDefaultRules +- UnboxedTuples +- DeriveDataTypeable +- DeriveGeneric +- DefaultSignatures +- InstanceSigs +- ConstrainedClassMethods +- PackageImports +- ImpredicativeTypes ++ MonomorphismRestriction ++ MultiParamTypeClasses ++ MultiWayIf ++ NPlusKPatterns ++ NamedFieldPuns ++ NamedWildCards ++ NegativeLiterals + NewQualifiedOperators ++ NondecreasingIndentation ++ NullaryTypeClasses ++ NumDecimals ++ OverlappingInstances ++ OverloadedLabels ++ OverloadedLists ++ OverloadedStrings ++ PackageImports ++ ParallelArrays ++ ParallelListComp ++ PartialTypeSignatures ++ PatternGuards ++ PatternSignatures ++ PatternSynonyms ++ PolyKinds ++ PolymorphicComponents + PostfixOperators + QuasiQuotes +- TransformListComp +- MonadComprehensions +- ViewPatterns +- XmlSyntax +- RegularPatterns +- TupleSections +- GHCForeignImportPrim +- NPlusKPatterns +- DoAndIfThenElse +- MultiWayIf +- LambdaCase ++ Rank2Types ++ RankNTypes + RebindableSyntax +- ExplicitForAll +- DatatypeContexts +- MonoLocalBinds +- DeriveFunctor +- DeriveTraversable +- DeriveFoldable +- NondecreasingIndentation +- SafeImports +- Safe +- Trustworthy +- Unsafe +- ConstraintKinds +- PolyKinds +- DataKinds +- ParallelArrays ++ RecordPuns ++ RecordWildCards ++ RecursiveDo ++ RegularPatterns ++ RelaxedPolyRec ++ RestrictedTypeSynonyms + RoleAnnotations +- OverloadedLists +- EmptyCase +- AutoDeriveTypeable +- NegativeLiterals +- BinaryLiterals +- NumDecimals +- NullaryTypeClasses +- ExplicitNamespaces +- AllowAmbiguousTypes +- JavaScriptFFI +- PatternSynonyms +- PartialTypeSignatures +- NamedWildCards +- DeriveAnyClass +- DeriveLift ++ Safe ++ SafeImports ++ ScopedTypeVariables ++ StandaloneDeriving + StaticPointers +- StrictData + Strict +- ApplicativeDo +- DuplicateRecordFields ++ StrictData ++ TemplateHaskell ++ TemplateHaskellQuotes ++ TraditionalRecordSyntax ++ TransformListComp ++ Trustworthy ++ TupleSections + TypeApplications ++ TypeFamilies + TypeInType ++ TypeOperators ++ TypeSynonymInstances ++ UnboxedTuples ++ UndecidableInstances + UndecidableSuperClasses +- MonadFailDesugaring +- TemplateHaskellQuotes +- OverloadedLabels ++ UnicodeSyntax ++ UnliftedFFITypes ++ Unsafe ++ ViewPatterns ++ XmlSyntax + + + +-- +cgit v0.11.2 +From efd1968c4a82f5a27dacf2147d555e68beee3c23 Mon Sep 17 00:00:00 2001 +From: Dominik Haumann +Date: Mon, 10 Jul 2017 22:10:44 +0200 +Subject: Haskell: next attempt to fix unit tests + +--- + autotests/html/highlight.hs.html | 2 +- + autotests/reference/highlight.hs.ref | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/autotests/html/highlight.hs.html b/autotests/html/highlight.hs.html +index 664d9f4..d38d237 100644 +--- a/autotests/html/highlight.hs.html ++++ b/autotests/html/highlight.hs.html +@@ -136,6 +136,6 @@ justtesting'' 9 -- multiline pragma with language extensions + + {-# LANGUAGE OverlappingInstances, +- BangPatterns ++ BangPatterns + #-} + +diff --git a/autotests/reference/highlight.hs.ref b/autotests/reference/highlight.hs.ref +index 5b9a108..cc05ebf 100644 +--- a/autotests/reference/highlight.hs.ref ++++ b/autotests/reference/highlight.hs.ref +@@ -130,5 +130,5 @@ + -- multiline pragma with language extensions
+
+ {-# LANGUAGE OverlappingInstances,
+- BangPatterns
+-#-}
++ BangPatterns
++#-}
+-- +cgit v0.11.2 diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.36.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.36.0.ebuild index d8e1b700f083..5c96bc1c51c3 100644 --- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.36.0.ebuild +++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.36.0.ebuild @@ -21,6 +21,8 @@ DEPEND="${RDEPEND} nls? ( $(add_qt_dep linguist-tools) ) " +PATCHES=( "${FILESDIR}/${P}-tests.patch" ) + src_install() { kde5_src_install dobin "${BUILD_DIR}"/src/indexer/katehighlightingindexer -- cgit v1.2.3-65-gdbad