[gentoo-commits] repo/gentoo:master commit in: games-board/chessx/files/, games-board/chessx/

[gentoo-commits] repo/gentoo:master commit in: games-board/chessx/files/, games-board/chessx/

[Andreas Sturmlechner]

commit:     f7744d04b257946e452e24fe0fd0cd23e38d6878
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 23:40:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 00:29:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7744d04

games-board/chessx: Fix build failure caused by missing translations

Thanks to openSUSE for the patch.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-board/chessx/chessx-1.5.4.ebuild             |  5 ++++-
 .../files/chessx-1.5.4-missing-translations.patch  | 24 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/games-board/chessx/chessx-1.5.4.ebuild b/games-board/chessx/chessx-1.5.4.ebuild
index 3df40ee6d51..d97f0eac6a8 100644
--- a/games-board/chessx/chessx-1.5.4.ebuild
+++ b/games-board/chessx/chessx-1.5.4.ebuild
@@ -34,7 +34,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${P}-system-quazip.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-system-quazip.patch
+	"${FILESDIR}"/${P}-missing-translations.patch
+)
 
 src_configure() {
 	eqmake5

diff --git a/games-board/chessx/files/chessx-1.5.4-missing-translations.patch b/games-board/chessx/files/chessx-1.5.4-missing-translations.patch
new file mode 100644
index 00000000000..7c874e16508
--- /dev/null
+++ b/games-board/chessx/files/chessx-1.5.4-missing-translations.patch
@@ -0,0 +1,24 @@
+Index: resources.qrc
+===================================================================
+--- a/resources.qrc
++++ b/resources.qrc
+@@ -12,11 +12,7 @@
+         <file alias="help/about4.html">data/help/about4.html</file>
+         <file alias="help/about5.html">data/help/about5.html</file>
+         <file alias="help/about6.html">data/help/about6.html</file>
+-        <file alias="i18n/chessx_da.qm">i18n/chessx_da.qm</file>
+         <file alias="i18n/chessx_de.qm">i18n/chessx_de.qm</file>
+-        <file alias="i18n/chessx_fr.qm">i18n/chessx_fr.qm</file>
+-        <file alias="i18n/chessx_it.qm">i18n/chessx_it.qm</file>
+-        <file alias="i18n/chessx_cz.qm">i18n/chessx_cz.qm</file>
+         <file alias="images/accept.png">data/images/accept.png</file>
+         <file alias="images/annotate.png">data/images/annotate.png</file>
+         <file alias="images/arrow_green.png">data/images/arrow_green.png</file>
+@@ -180,7 +176,6 @@
+         <file alias="themes/shadow/leipzig.png">data/themes/shadow/leipzig.png</file>
+         <file alias="themes/shadow/merida.png">data/themes/shadow/merida.png</file>
+         <file alias="themes/shadow/spatial.png">data/themes/shadow/spatial.png</file>
+-        <file alias="i18n/chessx_ru.qm">i18n/chessx_ru.qm</file>
+         <file alias="images/threat_black.png">data/images/threat_black.png</file>
+         <file alias="images/threat_white.png">data/images/threat_white.png</file>
+         <file alias="images/black_wall.png">data/images/black_wall.png</file>

[gentoo-commits] repo/gentoo:master commit in: games-board/chessx/files/, games-board/chessx/

[Andreas Sturmlechner]

commit:     8d8325d22be8b750083a2863c5382eaacf6d2a72
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 16:44:31 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 19:52:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d8325d2

games-board/chessx: Support build with >=dev-libs/quazip-1.0

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-board/chessx/chessx-1.5.4-r2.ebuild                        | 7 +++++++
 .../chessx/{chessx-1.5.4-r2.ebuild => chessx-1.5.4-r3.ebuild}    | 9 ++++++++-
 games-board/chessx/files/chessx-1.5.4-system-quazip.patch        | 2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/games-board/chessx/chessx-1.5.4-r2.ebuild b/games-board/chessx/chessx-1.5.4-r2.ebuild
index f24f065884e..4e6ee73c879 100644
--- a/games-board/chessx/chessx-1.5.4-r2.ebuild
+++ b/games-board/chessx/chessx-1.5.4-r2.ebuild
@@ -41,6 +41,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-install.patch
 )
 
+src_prepare() {
+	default
+	if has_version "<dev-libs/quazip-1.0"; then
+		sed -e "/^PKGCONFIG/s/quazip/quazip1-qt5/" -i chessx.pro || die
+	fi
+}
+
 src_configure() {
 	eqmake5
 }

diff --git a/games-board/chessx/chessx-1.5.4-r2.ebuild b/games-board/chessx/chessx-1.5.4-r3.ebuild
similarity index 83%
copy from games-board/chessx/chessx-1.5.4-r2.ebuild
copy to games-board/chessx/chessx-1.5.4-r3.ebuild
index f24f065884e..b3e40f7c587 100644
--- a/games-board/chessx/chessx-1.5.4-r2.ebuild
+++ b/games-board/chessx/chessx-1.5.4-r3.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/quazip-0.9.1:0
+	>=dev-libs/quazip-0.9.1:0=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
@@ -41,6 +41,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-install.patch
 )
 
+src_prepare() {
+	xdg_src_prepare
+	if has_version "<dev-libs/quazip-1.0"; then
+		sed -e "/^PKGCONFIG/s/quazip1-qt5/quazip/" -i chessx.pro || die
+	fi
+}
+
 src_configure() {
 	eqmake5
 }

diff --git a/games-board/chessx/files/chessx-1.5.4-system-quazip.patch b/games-board/chessx/files/chessx-1.5.4-system-quazip.patch
index b5e4cf8f435..6610d3c8e42 100644
--- a/games-board/chessx/files/chessx-1.5.4-system-quazip.patch
+++ b/games-board/chessx/files/chessx-1.5.4-system-quazip.patch
@@ -67,7 +67,7 @@ Index: chessx.pro
 -INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
 +
 +CONFIG += link_pkgconfig
-+PKGCONFIG += quazip
++PKGCONFIG += quazip1-qt5
  
  win32 {
      # DEFINES += ZLIB_WINAPI