diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2017-09-11 19:35:54 +0200 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2017-09-11 14:39:16 -0400 |
| commit | 9a891bb6bbf75ed0314efdd2916189adec7a483f (patch) | |
| tree | e073fe55dedb35b0ad1927ba6ce210c04e47f9cc /app-i18n/zinnia | |
| parent | dev-libs/oniguruma: Version bump (6.6.1). (diff) | |
| download | gentoo-9a891bb6bbf75ed0314efdd2916189adec7a483f.tar.gz gentoo-9a891bb6bbf75ed0314efdd2916189adec7a483f.tar.bz2 gentoo-9a891bb6bbf75ed0314efdd2916189adec7a483f.zip | |
app-i18n/zinnia: Clean patches.
Diffstat (limited to 'app-i18n/zinnia')
| -rw-r--r-- | app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch | 11 | ||||
| -rw-r--r-- | app-i18n/zinnia/files/zinnia-0.06-flags.patch (renamed from app-i18n/zinnia/files/zinnia-0.06-ricedown.patch) | 8 | ||||
| -rw-r--r-- | app-i18n/zinnia/files/zinnia-0.06-gcc6.patch | 13 | ||||
| -rw-r--r-- | app-i18n/zinnia/files/zinnia-0.06-perl_build.patch (renamed from app-i18n/zinnia/files/zinnia-0.06-perl.patch) | 8 | ||||
| -rw-r--r-- | app-i18n/zinnia/zinnia-0.06-r3.ebuild | 6 |
5 files changed, 20 insertions, 26 deletions
diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch b/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch new file mode 100644 index 000000000000..0ef6ae40e434 --- /dev/null +++ b/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch @@ -0,0 +1,11 @@ +--- /trainer.cpp ++++ /trainer.cpp +@@ -103,7 +103,7 @@ + if (!fn) { + return false; + } +- x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn)); ++ x_.push_back(std::make_pair(y, fn)); + return true; + } + diff --git a/app-i18n/zinnia/files/zinnia-0.06-ricedown.patch b/app-i18n/zinnia/files/zinnia-0.06-flags.patch index 397d0b0688ad..80442ee4880f 100644 --- a/app-i18n/zinnia/files/zinnia-0.06-ricedown.patch +++ b/app-i18n/zinnia/files/zinnia-0.06-flags.patch @@ -1,8 +1,6 @@ -Index: zinnia-0.06/configure.in -=================================================================== ---- zinnia-0.06.orig/configure.in -+++ zinnia-0.06/configure.in -@@ -59,15 +59,6 @@ AC_ARG_WITH(pkgconfigdir, +--- /configure.in ++++ /configure.in +@@ -59,15 +59,6 @@ AC_SUBST([pkgconfigdir]) AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}]) diff --git a/app-i18n/zinnia/files/zinnia-0.06-gcc6.patch b/app-i18n/zinnia/files/zinnia-0.06-gcc6.patch deleted file mode 100644 index f6ea7e19e19c..000000000000 --- a/app-i18n/zinnia/files/zinnia-0.06-gcc6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/old/trainer.cpp b/zinnia-0.06/trainer.cpp -index fdb044c..8b21e6c 100644 ---- a/old/trainer.cpp -+++ b/zinnia-0.06/trainer.cpp -@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer { - if (!fn) { - return false; - } -- x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn)); -+ x_.push_back(std::make_pair(y, fn)); - return true; - } - diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl.patch b/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch index 3688a91ad9ca..4da9e1eeb900 100644 --- a/app-i18n/zinnia/files/zinnia-0.06-perl.patch +++ b/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch @@ -1,8 +1,6 @@ -Index: zinnia-0.06/perl/Makefile.PL -=================================================================== ---- zinnia-0.06.orig/perl/Makefile.PL -+++ zinnia-0.06/perl/Makefile.PL -@@ -4,7 +4,7 @@ WriteMakefile( +--- /perl/Makefile.PL ++++ /perl/Makefile.PL +@@ -4,7 +4,7 @@ 'CC' => 'c++', 'LD' => 'c++', 'INC' => '', diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild index 660166d01089..a012fde380d6 100644 --- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild +++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild @@ -16,9 +16,9 @@ KEYWORDS="amd64 x86" IUSE="perl static-libs" DOCS=( AUTHORS ChangeLog NEWS README ) PATCHES=( - "${FILESDIR}/${P}-ricedown.patch" - "${FILESDIR}/${P}-perl.patch" - "${FILESDIR}/${P}-gcc6.patch" + "${FILESDIR}/${P}-flags.patch" + "${FILESDIR}/${P}-perl_build.patch" + "${FILESDIR}/${P}-c++-2011.patch" ) AUTOTOOLS_AUTORECONF=yes |