* [gentoo-commits] repo/gentoo:master commit in: dev-games/tiled/files/, dev-games/tiled/
@ 2024-08-20 7:16 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2024-08-20 7:16 UTC (permalink / raw
To: gentoo-commits
commit: 08c0f28539d13a21273258da78312611bc7a250e
Author: mechakotik <mechakotik <AT> gmail <DOT> com>
AuthorDate: Wed Aug 14 12:44:37 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 07:14:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c0f285
dev-games/tiled: adopt package, add 1.11.0
Closes: https://bugs.gentoo.org/928045
Closes: https://bugs.gentoo.org/929397
Co-authored-by: Alfred Wingate <parona <AT> protonmail.com>
Co-authored-by: juippis <juippis <AT> gmail.com>
Signed-off-by: Andrei Sabalenka <mechakotik <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37606
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-games/tiled/Manifest | 1 +
dev-games/tiled/files/tiled-1.11.0-python.patch | 55 +++++++++++++++
dev-games/tiled/metadata.xml | 15 ++++-
dev-games/tiled/tiled-1.11.0.ebuild | 90 +++++++++++++++++++++++++
4 files changed, 159 insertions(+), 2 deletions(-)
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index e42c7439c30b..99a75380d3c3 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1 +1,2 @@
+DIST tiled-1.11.0.tar.gz 17458724 BLAKE2B 3e7ea2ce4a61aa31d60487bf4cd68efb9307be0a753ee1571b9d2a90dff5299fdbbfd432c38eddafbea98cd6a1c59aa338c9ab5337e923e3178456a720e24ed4 SHA512 59e7ff38bedb0b897b40b2d3f6231004970de843e3700ef8adfaf78ab9b15c57e291ec27d409ba61094871b84f27238defb33bef5b23e838736f515ec1addf5d
DIST tiled-1.8.6.tar.gz 17053221 BLAKE2B a226ff9861ebfa3980176fac2b23c7fff8ac6db585444c5d5c21afff2301298e1eaa74179970bfaeb07c62074c706378040c520d5f0155b030f9e2025c51abb0 SHA512 f77ff46fbb707d8c02499f168e5748f39081fa780fb9a5b1ea04603b09cd71280d76034cab28b23fc30280bd856121e473c992c9c39d7c46fc97d5fbfbe4191d
diff --git a/dev-games/tiled/files/tiled-1.11.0-python.patch b/dev-games/tiled/files/tiled-1.11.0-python.patch
new file mode 100644
index 000000000000..f5407045e019
--- /dev/null
+++ b/dev-games/tiled/files/tiled-1.11.0-python.patch
@@ -0,0 +1,55 @@
+diff --git a/qbs/imports/PythonProbe.qbs b/qbs/imports/PythonProbe.qbs
+index 52eae7fc..93b4270c 100644
+--- a/qbs/imports/PythonProbe.qbs
++++ b/qbs/imports/PythonProbe.qbs
+@@ -7,7 +7,6 @@ import qbs.Utilities
+ Probe {
+ id: pythonDllProbe
+
+- property string pythonDir: pythonInstallDir // Input
+ property string buildVariant: qbs.buildVariant // Input
+ property string minVersion: "3.5" // Input
+ property string fileNamePrefix // Output
+@@ -17,18 +16,9 @@ Probe {
+ console.warn(msg + " The Python plugin will not be available.");
+ }
+
+- if (!pythonDir) {
+- printWarning("PYTHONHOME not set.");
+- return;
+- }
+- if (!File.exists(pythonDir)) {
+- printWarning("The provided Python installation directory '" + pythonDir
+- + "' does not exist.");
+- return;
+- }
+ var p = new Process();
+ try {
+- var pythonFilePath = FileInfo.joinPaths(pythonDir, "python.exe");
++ var pythonFilePath = "python";
+ p.exec(pythonFilePath, ["--version"], true);
+ var output = p.readStdOut().trim();
+ var magicPrefix = "Python ";
+@@ -45,9 +35,7 @@ Probe {
+ return;
+ }
+ if (Utilities.versionCompare(versionNumberString, minVersion) < 0) {
+- printWarning("The Python installation at '" + pythonDir
+- + "' has version " + versionNumberString + ", but " + minVersion + " or higher "
+- + "is required.");
++ printWarning("The Python installation has version " + versionNumberString + ", but " + minVersion + " or higher " + "is required.");
+ return;
+ }
+ found = true;
+diff --git a/src/plugins/python/python.qbs b/src/plugins/python/python.qbs
+index f1c959d3..8c43af9c 100644
+--- a/src/plugins/python/python.qbs
++++ b/src/plugins/python/python.qbs
+@@ -28,7 +28,6 @@ TiledPlugin {
+
+ PythonProbe {
+ id: pythonDllProbe
+- pythonDir: Environment.getEnv("PYTHONHOME")
+ minVersion: "3.8"
+ }
+
diff --git a/dev-games/tiled/metadata.xml b/dev-games/tiled/metadata.xml
index 13233bbdb862..d6abd76eacce 100644
--- a/dev-games/tiled/metadata.xml
+++ b/dev-games/tiled/metadata.xml
@@ -1,8 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>mechakotik@gmail.com</email>
+ <name>Andrei Sabalenka</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
- <remote-id type="github">bjorn/tiled</remote-id>
+ <remote-id type="github">mapeditor/tiled</remote-id>
</upstream>
+ <use>
+ <flag name="minimal">Exclude optional plugins and development headers</flag>
+ </use>
</pkgmetadata>
+
diff --git a/dev-games/tiled/tiled-1.11.0.ebuild b/dev-games/tiled/tiled-1.11.0.ebuild
new file mode 100644
index 000000000000..33d1cc5458c0
--- /dev/null
+++ b/dev-games/tiled/tiled-1.11.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+inherit edo flag-o-matic multiprocessing python-single-r1 toolchain-funcs xdg
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/ https://github.com/mapeditor/tiled"
+SRC_URI="https://github.com/mapeditor/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples minimal python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ app-arch/zstd:=
+ dev-qt/qtbase:6[X,dbus,gui,network,opengl,widgets]
+ dev-qt/qtdeclarative:6
+ dev-qt/qtsvg:6
+ sys-libs/zlib
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/qbs
+ dev-qt/qtbase:6
+ dev-qt/qttools:6[linguist]
+"
+
+QBS_PRODUCTS="tiled,csv,json"
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+qbs_format_flags() {
+ local -a array
+ for flag in ${@}; do
+ array+=( "\"${flag}\"" )
+ done
+ echo "[$(IFS=","; echo "${array[*]}")]"
+}
+
+src_configure() {
+ if use python; then
+ eapply "${FILESDIR}"/${P}-python.patch
+ QBS_PRODUCTS="${QBS_PRODUCTS},python"
+ fi
+ if ! use minimal; then
+ QBS_PRODUCTS="${QBS_PRODUCTS},defold,defoldcollection,droidcraft,flare,gmx,json1,lua,replicaisland,rpmap,tbin,tengine,terraingenerator,tmxrasterizer,tmxviewer,tscn,yy"
+ fi
+
+ edo qbs setup-qt /usr/bin/qmake6 qt6
+ edo qbs config defaultProfile qt6
+
+ local toolchain=$(tc-get-compiler-type)
+ edo qbs setup-toolchains ${toolchain} ${toolchain}
+ edo qbs config profiles.qt6.baseProfile ${toolchain}
+
+ edo qbs resolve \
+ --force-probe-execution \
+ qbs.installPrefix:"/usr" \
+ projects.Tiled.useRPaths:false \
+ projects.Tiled.installHeaders:$(usex minimal false true) \
+ project.libDir:$(get_libdir) \
+ modules.cpp.cFlags:$(qbs_format_flags ${CFLAGS}) \
+ modules.cpp.cxxFlags:$(qbs_format_flags ${CXXFLAGS}) \
+ modules.cpp.linkerFlags:$(qbs_format_flags $(raw-ldflags ${LDFLAGS}))
+}
+
+src_compile() {
+ edo qbs build \
+ -p ${QBS_PRODUCTS} \
+ -j $(get_makeopts_jobs)
+}
+
+src_install() {
+ edo qbs install -p ${QBS_PRODUCTS} --install-root "${D}"
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-games/tiled/files/, dev-games/tiled/
@ 2021-12-02 6:15 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2021-12-02 6:15 UTC (permalink / raw
To: gentoo-commits
commit: 5e65040bc2533dd2dea5492051db32b76121d0a6
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 06:14:51 2021 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 06:15:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e65040b
dev-games/tiled: remove 1.4.3
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
dev-games/tiled/Manifest | 1 -
dev-games/tiled/files/tiled-1.4.3-python-38.patch | 14 -----
dev-games/tiled/tiled-1.4.3-r1.ebuild | 73 -----------------------
3 files changed, 88 deletions(-)
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index f2796801a6a4..2311329195ff 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,2 +1 @@
-DIST tiled-1.4.3.tar.gz 17806808 BLAKE2B 81b5a32cc1e6f5f3b4af5520752d34572f0e78aad90df435d075b53ac18b39961aa22d23cff614cd83f0883fd2fd2bca69026160cb8b1b727fddaeff5764babe SHA512 1e75e323733e05563bf542364778d95f2f22484ec0d85b4a9e7fac782c117934b37b049724979be5c83de86a3900c7ca2e9f3c5a660c530d2ecd0f023eb22c2e
DIST tiled-1.7.2.tar.gz 16743422 BLAKE2B 0d8ae95b2fc68326d0a4989b26535cd72900ddf9674ad892c287f9d7df2f551fc46c9fa9c8991315f55ae90663a9a5b9c4239fd2ed61c240a36a60102b2710b3 SHA512 6d766adbfcb642279eb0ba27410858c54a29ed8e697445b6fb96ce210d0b1433b1ed4715e1d78af3aea8ec71a87b24eea52216bf6236159e0c8fdf87a2339a59
diff --git a/dev-games/tiled/files/tiled-1.4.3-python-38.patch b/dev-games/tiled/files/tiled-1.4.3-python-38.patch
deleted file mode 100644
index 5515fa8fff2f..000000000000
--- a/dev-games/tiled/files/tiled-1.4.3-python-38.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/plugins/python/find_python.pri
-+++ b/src/plugins/python/find_python.pri
-@@ -1,6 +1,10 @@
- !contains(DISABLE_PYTHON_PLUGIN, yes) {
- unix {
-- packagesExist(python3) {
-+ packagesExist(python3-embed) {
-+ HAVE_PYTHON = yes
-+ CONFIG += link_pkgconfig
-+ PKGCONFIG += python3-embed
-+ } else:packagesExist(python3) {
- HAVE_PYTHON = yes
- CONFIG += link_pkgconfig
- PKGCONFIG += python3
diff --git a/dev-games/tiled/tiled-1.4.3-r1.ebuild b/dev-games/tiled/tiled-1.4.3-r1.ebuild
deleted file mode 100644
index fb10433d8bf5..000000000000
--- a/dev-games/tiled/tiled-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit python-single-r1 qmake-utils xdg-utils
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- app-arch/zstd:=
- >=dev-qt/qtcore-5.14:5
- >=dev-qt/qtdeclarative-5.14:5
- >=dev-qt/qtgui-5.14:5
- >=dev-qt/qtnetwork-5.14:5
- >=dev-qt/qtwidgets-5.14:5
- sys-libs/zlib
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-PATCHES=( "${FILESDIR}/${P}-python-38.patch" )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- eqmake5 \
- LIBDIR="/usr/$(get_libdir)" \
- PREFIX="/usr" \
- SYSTEM_ZSTD="yes" \
- DISABLE_PYTHON_PLUGIN="$(usex !python)" \
- USE_FHS_PLUGIN_PATH="true"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- einstalldocs
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-games/tiled/files/, dev-games/tiled/
@ 2019-04-13 2:43 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2019-04-13 2:43 UTC (permalink / raw
To: gentoo-commits
commit: a1bb0973c550df767d3c4a171111989d61496b83
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 02:42:43 2019 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 02:42:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1bb0973
dev-games/tiled: remove 1.2.0, 1.2.1, and 1.2.2
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
dev-games/tiled/Manifest | 3 --
dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch | 26 ----------
dev-games/tiled/tiled-1.2.0.ebuild | 64 -------------------------
dev-games/tiled/tiled-1.2.1.ebuild | 63 ------------------------
dev-games/tiled/tiled-1.2.2.ebuild | 63 ------------------------
5 files changed, 219 deletions(-)
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 6ed911bfd72..a2347038357 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,4 +1 @@
-DIST tiled-1.2.0.tar.gz 17007687 BLAKE2B 6bb5a34a19868574801a69015f6a05b299dd5b34df865cacf5d2a747a62ae731b80778fe49a432c5487cbfa3d30186dc80011cc8882cb86ac347fb35a7421cbc SHA512 9c0c151348a90344b355e9bc8a7c9d38e2203d48474e8cf496e2c08cc75f764042e4355db2827f0e3518a1c03bfbcc79be7ba643c44c50430c7ecec09fbb8563
-DIST tiled-1.2.1.tar.gz 16773680 BLAKE2B 1b7c662863d931dadd46d20c90822659b71fe5c7432cc6486813a6db533057d9db9768c2d14832a74b0f768c29b3d340cdc28a67df830ca984ad824610afe662 SHA512 9a66d41ed991b6af226c9456758f27bf5cf2e8d1059042fb684b003608509c0d0e13776710e777bab0e12f55223e4fca4048a07661c36a3273f9c6c5cbf7fa5d
-DIST tiled-1.2.2.tar.gz 16846444 BLAKE2B c359a75c5a3de8b9f9e52f2e772df9e6bc4ff7200330309e071f5497e80916a3512b47d47d6c502e186e95807a899fec7795d4246621ed988523468542a69b68 SHA512 b488f30f258d13e1513df7398b04e76153803c9384f94c0167d0a971c72e9c26f39eeceb8d587b36509b1c92e5e2f4df3c0cc41f49d66db2c1d9cf5b4b985be3
DIST tiled-1.2.3.tar.gz 16848125 BLAKE2B cc2ab2a2ab14a575da1f47a415e1c544de9a80417ea5a081684893bad253fc742f89f5e17739bfe0617f859f6921ab214c2e8bdefe321545008b277684e654b1 SHA512 0c9e818872b1e8de67ff8d943dc47abb63667bc45917b29dca959b0a32594be4ffb156469375c0f5c4a4fa71ee85b05c018c58a2f581a860405cbb12c9c0aac5
diff --git a/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
deleted file mode 100644
index 43b3c64659c..00000000000
--- a/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Bug: https://bugs.gentoo.org/667000
-
-From 1f039bc40c730cdd93df8213795bbb0fcb634dfe Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 11 Oct 2018 22:51:03 +1100
-Subject: [PATCH] Add missing include.
-
----
- src/tiled/newsfeed.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/tiled/newsfeed.cpp b/src/tiled/newsfeed.cpp
-index ddf988c3..2e2e12b9 100644
---- a/src/tiled/newsfeed.cpp
-+++ b/src/tiled/newsfeed.cpp
-@@ -22,6 +22,7 @@
-
- #include "preferences.h"
-
-+#include <QDebug>
- #include <QNetworkAccessManager>
- #include <QNetworkReply>
- #include <QSettings>
---
-2.18.1
-
diff --git a/dev-games/tiled/tiled-1.2.0.ebuild b/dev-games/tiled/tiled-1.2.0.ebuild
deleted file mode 100644
index a74c6edbb56..00000000000
--- a/dev-games/tiled/tiled-1.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-qt/qtcore-5.9:5
- >=dev-qt/qtgui-5.9:5
- >=dev-qt/qtnetwork-5.9:5
- >=dev-qt/qtwidgets-5.9:5
- sys-libs/zlib
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- einstalldocs
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-games/tiled/tiled-1.2.1.ebuild b/dev-games/tiled/tiled-1.2.1.ebuild
deleted file mode 100644
index fb9cfdad6b9..00000000000
--- a/dev-games/tiled/tiled-1.2.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-qt/qtcore-5.9:5
- >=dev-qt/qtgui-5.9:5
- >=dev-qt/qtnetwork-5.9:5
- >=dev-qt/qtwidgets-5.9:5
- sys-libs/zlib
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- einstalldocs
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-games/tiled/tiled-1.2.2.ebuild b/dev-games/tiled/tiled-1.2.2.ebuild
deleted file mode 100644
index b22b7a0e99e..00000000000
--- a/dev-games/tiled/tiled-1.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-qt/qtcore-5.9:5
- >=dev-qt/qtgui-5.9:5
- >=dev-qt/qtnetwork-5.9:5
- >=dev-qt/qtwidgets-5.9:5
- sys-libs/zlib
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- einstalldocs
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-games/tiled/files/, dev-games/tiled/
@ 2018-10-11 11:58 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2018-10-11 11:58 UTC (permalink / raw
To: gentoo-commits
commit: c4481aab161ad80182b44ad9199f36a0a9d20ae5
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 11:57:37 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 11:58:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4481aab
dev-games/tiled: fix build with Qt 5.11
Closes: https://bugs.gentoo.org/667000
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch | 26 +++++++++++++++++++++++++
dev-games/tiled/tiled-1.2.0.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
new file mode 100644
index 00000000000..43b3c64659c
--- /dev/null
+++ b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/667000
+
+From 1f039bc40c730cdd93df8213795bbb0fcb634dfe Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 22:51:03 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ src/tiled/newsfeed.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tiled/newsfeed.cpp b/src/tiled/newsfeed.cpp
+index ddf988c3..2e2e12b9 100644
+--- a/src/tiled/newsfeed.cpp
++++ b/src/tiled/newsfeed.cpp
+@@ -22,6 +22,7 @@
+
+ #include "preferences.h"
+
++#include <QDebug>
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+ #include <QSettings>
+--
+2.18.1
+
diff --git a/dev-games/tiled/tiled-1.2.0.ebuild b/dev-games/tiled/tiled-1.2.0.ebuild
index fb9cfdad6b9..75a12ed885f 100644
--- a/dev-games/tiled/tiled-1.2.0.ebuild
+++ b/dev-games/tiled/tiled-1.2.0.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
"
DOCS=( AUTHORS COPYING NEWS.md README.md )
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
pkg_setup() {
use python && python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-20 7:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-20 7:16 [gentoo-commits] repo/gentoo:master commit in: dev-games/tiled/files/, dev-games/tiled/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2021-12-02 6:15 Michael Palimaka
2019-04-13 2:43 Michael Palimaka
2018-10-11 11:58 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox