diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-12-28 00:29:07 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-12-28 00:29:43 +0100 |
| commit | 924de845e09c14313584dbd75f87ee82bd01b989 (patch) | |
| tree | 701ae92e5a7f52a517c880fccce90550933a427a /sci-electronics | |
| parent | package.mask: Mask binutils 2.28 because of security issues (about 20 bugs) (diff) | |
| download | gentoo-924de845e09c14313584dbd75f87ee82bd01b989.tar.gz gentoo-924de845e09c14313584dbd75f87ee82bd01b989.tar.bz2 gentoo-924de845e09c14313584dbd75f87ee82bd01b989.zip | |
sci-electronics/klayout: Add backported patch. Build still fails.
See also
https://github.com/klayoutmatthias/klayout/issues/47
https://github.com/klayoutmatthias/klayout/issues/34
https://github.com/klayoutmatthias/klayout/commit/11cb5eb99836e043d71b556af010b29624c3f569
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/klayout/files/klayout-0.25-qt58.patch | 38 | ||||
| -rw-r--r-- | sci-electronics/klayout/klayout-0.25.ebuild | 2 |
2 files changed, 40 insertions, 0 deletions
diff --git a/sci-electronics/klayout/files/klayout-0.25-qt58.patch b/sci-electronics/klayout/files/klayout-0.25-qt58.patch new file mode 100644 index 000000000000..544bf2992c6a --- /dev/null +++ b/sci-electronics/klayout/files/klayout-0.25-qt58.patch @@ -0,0 +1,38 @@ +From 11cb5eb99836e043d71b556af010b29624c3f569 Mon Sep 17 00:00:00 2001 +From: Matthias Koefferlein <matthias@koefferlein.de> +Date: Sun, 26 Nov 2017 22:51:36 +0100 +Subject: [PATCH] Qt 5.8.0 compatibility + +--- + scripts/mkqtdecl5/mkqtdecl.conf | 2 ++ + src/gsiqt5/gsiDeclQtTypeTraits.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf +index a704ebc..ee58b82 100644 +--- a/scripts/mkqtdecl5/mkqtdecl.conf ++++ b/scripts/mkqtdecl5/mkqtdecl.conf +@@ -1484,6 +1484,8 @@ final_class "QAccessibleObject" # because navigate cannot be implemented + # final_class "QAccessiblePlugin" # because navigate cannot be implemented + final_class "QAccessibleWidget" # because navigate cannot be implemented + ++no_copy_ctor "QIconEngine" ++ + # -------------------------------------------------------------- + # QtXml + +diff --git a/src/gsiqt5/gsiDeclQtTypeTraits.h b/src/gsiqt5/gsiDeclQtTypeTraits.h +index eba0986..dd68128 100644 +--- a/src/gsiqt5/gsiDeclQtTypeTraits.h ++++ b/src/gsiqt5/gsiDeclQtTypeTraits.h +@@ -3418,6 +3418,7 @@ template <> struct type_traits<QIconEngine> : public type_traits<void> { + class QIconEngine_Adaptor; + namespace tl { + template <> struct type_traits<QIconEngine_Adaptor> : public type_traits<void> { ++ typedef tl::false_tag has_copy_constructor; + }; + } + +-- +2.15.1 + diff --git a/sci-electronics/klayout/klayout-0.25.ebuild b/sci-electronics/klayout/klayout-0.25.ebuild index 157da060047f..e3b40dead5b8 100644 --- a/sci-electronics/klayout/klayout-0.25.ebuild +++ b/sci-electronics/klayout/klayout-0.25.ebuild @@ -37,6 +37,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${P}-qt58.patch" ) + pkg_setup() { python-single-r1_pkg_setup ruby-ng_pkg_setup |