public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/files/, dev-qt/qthelp/
@ 2013-07-30 18:25 Davide Pesavento
  0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2013-07-30 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     553d44ebef8a9221f9717216a34c30de5730e94c
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jul 30 18:26:06 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 18:26:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=553d44eb

[dev-qt/qthelp] Sync with portage.

Package-Manager: portage-2.2.0_alpha190

---
 dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch   | 123 ----------------------
 dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch |  21 ++++
 dev-qt/qthelp/qthelp-4.8.9999.ebuild              |  12 ++-
 3 files changed, 31 insertions(+), 125 deletions(-)

diff --git a/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch
deleted file mode 100644
index 1c28c15..0000000
--- a/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- tools/assistant/compat/compat.pro	2010-10-08 16:54:09.804000000 +0300
-+++ tools/assistant/compat/compat.pro	2010-10-08 16:54:37.884000000 +0300
-@@ -14,6 +14,8 @@
- 
- PROJECTNAME = Assistant
- 
-+DESTDIR = ../../../bin
-+
- FORMS += helpdialog.ui \
-         mainwindow.ui \
-         tabbedbrowser.ui \
-@@ -59,6 +61,9 @@
-     TARGET = Assistant_adp
- }
- 
-+target.path=$$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
- TRANSLATIONS = translations/assistant_adp_de.ts \
-     translations/assistant_adp_ja.ts \
-     translations/assistant_adp_pl.ts \
---- tools/assistant/assistant.pro	2010-09-10 12:04:47.000000000 +0300
-+++ tools/assistant/assistant.pro	2010-06-02 05:03:09.000000000 +0300
-@@ -3,4 +3,6 @@
- 
- SUBDIRS += lib/fulltextsearch \
-            lib \
--           tools
-+           tools \
-+           compat \
-+           compat/lib \
-\ No newline at end of file
---- /dev/null
-+++ tools/assistant/compat/lib/QtAssistant/qassistantclient_global.h
-@@ -0,0 +1 @@
-+#include "../qassistantclient_global.h"
---- /dev/null	2010-09-28 21:07:22.854999850 +0300
-+++ tools/assistant/compat/assistant.pro	2010-06-02 05:03:09.000000000 +0300
-@@ -0,0 +1,84 @@
-+include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
-+
-+TEMPLATE = app
-+LANGUAGE = C++
-+TARGET = assistant_adp
-+
-+CONFIG += qt warn_on
-+
-+unix:contains(QT_CONFIG, dbus):QT += dbus
-+
-+build_all:!build_pass {
-+    CONFIG -= build_all
-+    CONFIG += release
-+}
-+QT += xml network
-+
-+PROJECTNAME = Assistant
-+DESTDIR = ../../../bin
-+
-+FORMS += helpdialog.ui \
-+        mainwindow.ui \
-+        tabbedbrowser.ui \
-+        topicchooser.ui
-+
-+SOURCES += main.cpp \
-+        helpwindow.cpp \
-+        topicchooser.cpp \
-+        docuparser.cpp \
-+        index.cpp \
-+        profile.cpp \
-+        config.cpp \
-+        helpdialog.cpp \
-+        mainwindow.cpp \
-+        tabbedbrowser.cpp \
-+        fontsettingsdialog.cpp
-+
-+HEADERS += helpwindow.h \
-+        topicchooser.h \
-+        docuparser.h \
-+        index.h \
-+        profile.h \
-+        helpdialog.h \
-+        mainwindow.h \
-+        tabbedbrowser.h \
-+        config.h \
-+        fontsettingsdialog.h
-+
-+RESOURCES += assistant.qrc
-+
-+contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
-+DEFINES += QT_KEYWORDS
-+#DEFINES +=  QT_PALMTOPCENTER_DOCS
-+
-+win32 {
-+    !wince*:LIBS += -lshell32
-+    RC_FILE = assistant.rc
-+}
-+
-+mac {
-+    ICON = assistant.icns
-+    TARGET = Assistant_adp
-+    QMAKE_INFO_PLIST = Info_mac.plist
-+}
-+
-+target.path=$$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
-+TRANSLATIONS = assistant_de.ts
-+
-+unix:!contains(QT_CONFIG, zlib):LIBS += -lz
-+
-+contains(CONFIG, static): {
-+    win32 {
-+        exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) {
-+            QTPLUGIN += qjpeg
-+            DEFINES += USE_STATIC_JPEG_PLUGIN            
-+        }
-+    } else {
-+        exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.a) {
-+            QTPLUGIN += qjpeg
-+            DEFINES += USE_STATIC_JPEG_PLUGIN            
-+        }        
-+    }
-+}

diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
new file mode 100644
index 0000000..cc76219
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
@@ -0,0 +1,21 @@
+--- tools/assistant/compat/compat.pro	2010-10-08 16:54:09.804000000 +0300
++++ tools/assistant/compat/compat.pro	2010-10-08 16:54:37.884000000 +0300
+@@ -14,6 +14,8 @@
+ 
+ PROJECTNAME = Assistant
+ 
++DESTDIR = ../../../bin
++
+ FORMS += helpdialog.ui \
+         mainwindow.ui \
+         tabbedbrowser.ui \
+@@ -59,6 +61,9 @@
+     TARGET = Assistant_adp
+ }
+ 
++target.path=$$[QT_INSTALL_BINS]
++INSTALLS += target
++
+ TRANSLATIONS = translations/assistant_adp_de.ts \
+     translations/assistant_adp_ja.ts \
+     translations/assistant_adp_pl.ts \

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 0ee9df7..4749453 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -26,6 +26,10 @@ DEPEND="
 	~dev-qt/qtcore-${PV}[aqua=,debug=]
 	~dev-qt/qtgui-${PV}[aqua=,debug=]
 	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
+	compat? (
+		~dev-qt/qtdbus-${PV}[aqua=,debug=]
+		sys-libs/zlib
+	)
 "
 RDEPEND="${DEPEND}"
 
@@ -45,6 +49,10 @@ pkg_setup() {
 		src
 		tools"
 
+	use compat && QT4_TARGET_DIRECTORIES+="
+		tools/assistant/compat
+		tools/assistant/compat/lib"
+
 	qt4-build_pkg_setup
 }
 
@@ -65,7 +73,7 @@ src_unpack() {
 src_prepare() {
 	qt4-build_src_prepare
 
-	use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
+	use compat && epatch "${FILESDIR}"/${PN}-4.8.5-fix-compat.patch
 
 	# bug 348034
 	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
@@ -77,7 +85,7 @@ src_configure() {
 		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
 		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
 		-no-multimedia -no-opengl -no-phonon -no-svg -no-webkit -no-xmlpatterns
-		-no-nas-sound -no-dbus -no-cups -no-nis -fontconfig"
+		-no-nas-sound -no-cups -no-nis -fontconfig"
 
 	qt4-build_src_configure
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/files/, dev-qt/qthelp/
@ 2015-01-26  2:58 Davide Pesavento
  0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2015-01-26  2:58 UTC (permalink / raw
  To: gentoo-commits

commit:     789292b21b56c2492279595820abdd67b6c69a57
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 26 02:55:11 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jan 26 02:55:11 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=789292b2

[dev-qt/qthelp:4] Sync.

Package-Manager: portage-2.2.15

---
 dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch | 21 ------------
 dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch | 40 +++++++++++++++++++++++
 dev-qt/qthelp/qthelp-4.8.9999.ebuild              |  4 +--
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
deleted file mode 100644
index cc76219..0000000
--- a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tools/assistant/compat/compat.pro	2010-10-08 16:54:09.804000000 +0300
-+++ tools/assistant/compat/compat.pro	2010-10-08 16:54:37.884000000 +0300
-@@ -14,6 +14,8 @@
- 
- PROJECTNAME = Assistant
- 
-+DESTDIR = ../../../bin
-+
- FORMS += helpdialog.ui \
-         mainwindow.ui \
-         tabbedbrowser.ui \
-@@ -59,6 +61,9 @@
-     TARGET = Assistant_adp
- }
- 
-+target.path=$$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
- TRANSLATIONS = translations/assistant_adp_de.ts \
-     translations/assistant_adp_ja.ts \
-     translations/assistant_adp_pl.ts \

diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch
new file mode 100644
index 0000000..bdebfd5
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch
@@ -0,0 +1,40 @@
+ tools/assistant/compat/compat.pro  | 5 +++++
+ tools/assistant/compat/lib/lib.pro | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
+index 171106a..51b8d5b 100755
+--- a/tools/assistant/compat/compat.pro
++++ b/tools/assistant/compat/compat.pro
+@@ -14,6 +14,8 @@ QT += xml network
+ 
+ PROJECTNAME = Assistant
+ 
++DESTDIR = ../../../bin
++
+ FORMS += helpdialog.ui \
+         mainwindow.ui \
+         tabbedbrowser.ui \
+@@ -59,6 +61,9 @@ mac {
+     TARGET = Assistant_adp
+ }
+ 
++target.path=$$[QT_INSTALL_BINS]
++INSTALLS += target
++
+ TRANSLATIONS = translations/assistant_adp_de.ts \
+     translations/assistant_adp_ja.ts \
+     translations/assistant_adp_pl.ts \
+diff --git a/tools/assistant/compat/lib/lib.pro b/tools/assistant/compat/lib/lib.pro
+index e50d470..8973d43 100755
+--- a/tools/assistant/compat/lib/lib.pro
++++ b/tools/assistant/compat/lib/lib.pro
+@@ -31,7 +31,7 @@ contains(CONFIG, static) {
+ 
+ #load up the headers info
+ CONFIG += qt_install_headers
+-HEADERS_PRI = $$QT_BUILD_TREE/include/QtAssistant/headers.pri
++HEADERS_PRI = $$QT_SOURCE_TREE/include/QtAssistant/headers.pri
+ include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
+ 
+ #mac frameworks

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 55ad8ad..edb13ad 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -58,7 +58,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.5-fix-compat.patch")
+	use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.6-fix-compat.patch")
 
 	qt4-build-multilib_src_prepare
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/files/, dev-qt/qthelp/
@ 2015-05-09 19:20 Davide Pesavento
  0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2015-05-09 19:20 UTC (permalink / raw
  To: gentoo-commits

commit:     9ba8da74f6f226a0898ae8b64be9c89267b63f46
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 19:20:35 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat May  9 19:20:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=9ba8da74

[dev-qt/qthelp:4] Sync.

Package-Manager: portage-2.2.18

 .../qthelp/files/qthelp-4.8.6-compat-install.patch | 35 +++++++++++++++++++
 .../qthelp/files/qthelp-4.8.6-compat-syncqt.patch  | 25 ++++++++++++++
 dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch  | 40 ----------------------
 dev-qt/qthelp/qthelp-4.8.9999.ebuild               | 15 ++++----
 4 files changed, 67 insertions(+), 48 deletions(-)

diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
new file mode 100644
index 0000000..e157381
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
@@ -0,0 +1,35 @@
+From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Wed, 6 May 2015 23:21:54 +0200
+Subject: [PATCH] Install assistant_adp binary.
+
+---
+ tools/assistant/compat/compat.pro | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
+index 171106a..a14e3f8 100755
+--- a/tools/assistant/compat/compat.pro
++++ b/tools/assistant/compat/compat.pro
+@@ -14,6 +14,8 @@ QT += xml network
+ 
+ PROJECTNAME = Assistant
+ 
++DESTDIR = ../../../bin
++
+ FORMS += helpdialog.ui \
+         mainwindow.ui \
+         tabbedbrowser.ui \
+@@ -59,6 +61,9 @@ mac {
+     TARGET = Assistant_adp
+ }
+ 
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
++
+ TRANSLATIONS = translations/assistant_adp_de.ts \
+     translations/assistant_adp_ja.ts \
+     translations/assistant_adp_pl.ts \
+-- 
+2.4.0
+

diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
new file mode 100644
index 0000000..4ba6b6f
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
@@ -0,0 +1,25 @@
+From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Wed, 6 May 2015 22:44:57 +0200
+Subject: [PATCH] Teach syncqt how to handle the QtAssistant compat headers.
+
+See https://bugs.gentoo.org/show_bug.cgi?id=529398#c47
+---
+ bin/syncqt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/bin/syncqt b/bin/syncqt
+index dd94d4d..cc5a7bf 100755
+--- a/bin/syncqt
++++ b/bin/syncqt
+@@ -81,6 +81,7 @@ my %modules = ( # path to module name map
+         "ActiveQt" => "$basedir/src/activeqt",
+         "QtTest" => "$basedir/src/testlib",
+         "QtHelp" => "$basedir/tools/assistant/lib",
++        "QtAssistant" => "$basedir/tools/assistant/compat/lib",
+         "QtDesigner" => "$basedir/tools/designer/src/lib",
+         "QtUiTools" => "$basedir/tools/designer/src/uitools",
+         "QtDBus" => "$basedir/src/dbus",
+-- 
+2.4.0
+

diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch
deleted file mode 100644
index bdebfd5..0000000
--- a/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- tools/assistant/compat/compat.pro  | 5 +++++
- tools/assistant/compat/lib/lib.pro | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
-index 171106a..51b8d5b 100755
---- a/tools/assistant/compat/compat.pro
-+++ b/tools/assistant/compat/compat.pro
-@@ -14,6 +14,8 @@ QT += xml network
- 
- PROJECTNAME = Assistant
- 
-+DESTDIR = ../../../bin
-+
- FORMS += helpdialog.ui \
-         mainwindow.ui \
-         tabbedbrowser.ui \
-@@ -59,6 +61,9 @@ mac {
-     TARGET = Assistant_adp
- }
- 
-+target.path=$$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
- TRANSLATIONS = translations/assistant_adp_de.ts \
-     translations/assistant_adp_ja.ts \
-     translations/assistant_adp_pl.ts \
-diff --git a/tools/assistant/compat/lib/lib.pro b/tools/assistant/compat/lib/lib.pro
-index e50d470..8973d43 100755
---- a/tools/assistant/compat/lib/lib.pro
-+++ b/tools/assistant/compat/lib/lib.pro
-@@ -31,7 +31,7 @@ contains(CONFIG, static) {
- 
- #load up the headers info
- CONFIG += qt_install_headers
--HEADERS_PRI = $$QT_BUILD_TREE/include/QtAssistant/headers.pri
-+HEADERS_PRI = $$QT_SOURCE_TREE/include/QtAssistant/headers.pri
- include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
- 
- #mac frameworks

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index edb13ad..3132c7f 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -9,7 +9,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Help module for the Qt toolkit"
 SRC_URI+="
 	compat? (
-		ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
+		http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
 		http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
 	)"
 
@@ -50,15 +50,19 @@ src_unpack() {
 	qt4-build-multilib_src_unpack
 
 	# compat version
-	# http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
+	# http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
 	if use compat; then
 		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die
 		mv "${WORKDIR}"/QtAssistant "${S}"/include || die
+		find "${S}"/tools/assistant/compat -type f -execdir chmod a-x '{}' + || die
 	fi
 }
 
 src_prepare() {
-	use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.6-fix-compat.patch")
+	use compat && PATCHES+=(
+		"${FILESDIR}/${PN}-4.8.6-compat-install.patch"
+		"${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch"
+	)
 
 	qt4-build-multilib_src_prepare
 
@@ -75,11 +79,6 @@ multilib_src_configure() {
 		-no-nas-sound -no-cups -no-nis -fontconfig
 	)
 	qt4_multilib_src_configure
-
-	if use compat; then
-		# syncqt knows nothing about these headers (bug 529398)
-		cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die
-	fi
 }
 
 multilib_src_compile() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/files/, dev-qt/qthelp/
@ 2022-06-18 14:32 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-06-18 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     a18a50b7ca3e5c70dda40161e56683c8cfd222ec
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 14:32:01 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 14:32:01 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a18a50b7

dev-qt/qthelp: Sync with 5.15.4::gentoo

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

 .../{qthelp-5.15.3-bogusdep.patch => qthelp-5.15.4-bogusdep.patch}      | 0
 dev-qt/qthelp/qthelp-5.15.5.9999.ebuild                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qthelp/files/qthelp-5.15.3-bogusdep.patch b/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch
similarity index 100%
rename from dev-qt/qthelp/files/qthelp-5.15.3-bogusdep.patch
rename to dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch

diff --git a/dev-qt/qthelp/qthelp-5.15.5.9999.ebuild b/dev-qt/qthelp/qthelp-5.15.5.9999.ebuild
index 0495ddc0..c4a55995 100644
--- a/dev-qt/qthelp/qthelp-5.15.5.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.5.9999.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 # https://invent.kde.org/qt/qt/qttools/-/merge_requests/2
-PATCHES=( "${FILESDIR}/${PN}-5.15.3-bogusdep.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.15.4-bogusdep.patch" )
 
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-06-18 14:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-18 14:32 [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/files/, dev-qt/qthelp/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2015-05-09 19:20 Davide Pesavento
2015-01-26  2:58 Davide Pesavento
2013-07-30 18:25 Davide Pesavento

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox