* [gentoo-commits] proj/kde:master commit in: kde-base/perlqt/files/, kde-base/perlqt/
@ 2013-06-20 1:42 Jonathan Callen
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Callen @ 2013-06-20 1:42 UTC (permalink / raw
To: gentoo-commits
commit: 23afa97d0edf4b22ae5d3c97b1ba461828f86ad1
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 01:36:20 2013 +0000
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 01:36:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=23afa97d
[kde-base/perlqt] Update patch for 4.10.80
Package-Manager: portage-2.2.0_alpha177
---
kde-base/perlqt/files/perlqt-4.10.80-vendor.patch | 11 +++++++++++
kde-base/perlqt/perlqt-4.10.49.9999.ebuild | 2 +-
kde-base/perlqt/perlqt-4.10.80.ebuild | 2 +-
kde-base/perlqt/perlqt-9999.ebuild | 2 +-
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/kde-base/perlqt/files/perlqt-4.10.80-vendor.patch b/kde-base/perlqt/files/perlqt-4.10.80-vendor.patch
new file mode 100644
index 0000000..635428f
--- /dev/null
+++ b/kde-base/perlqt/files/perlqt-4.10.80-vendor.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,7 +38,7 @@
+ include (FindPerlMore)
+ string(LENGTH "${PERL_INSTALL_PREFIX}" PERL_INSTALL_PREFIX_LEN)
+ math(EXPR PERL_INSTALL_PREFIX_LEN "${PERL_INSTALL_PREFIX_LEN}+1")
+-string(SUBSTRING ${PERL_SITE_ARCH_DIR} ${PERL_INSTALL_PREFIX_LEN} -1 CUSTOM_PERL_SITE_ARCH_DIR)
++string(SUBSTRING ${PERL_VENDOR_ARCH_DIR} ${PERL_INSTALL_PREFIX_LEN} -1 CUSTOM_PERL_SITE_ARCH_DIR)
+ file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${CUSTOM_PERL_SITE_ARCH_DIR}" CUSTOM_PERL_SITE_ARCH_DIR)
+ set(CUSTOM_PERL_SITE_ARCH_DIR ${CUSTOM_PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
+
diff --git a/kde-base/perlqt/perlqt-4.10.49.9999.ebuild b/kde-base/perlqt/perlqt-4.10.49.9999.ebuild
index 570bb85..fcbb93b 100644
--- a/kde-base/perlqt/perlqt-4.10.49.9999.ebuild
+++ b/kde-base/perlqt/perlqt-4.10.49.9999.ebuild
@@ -27,7 +27,7 @@ DEPEND=${RDEPEND}
add_blocker kdebindings-perl
PATCHES=(
- "${FILESDIR}/${PN}-4.7.2-vendor.patch"
+ "${FILESDIR}/${PN}-4.10.80-vendor.patch"
)
src_configure() {
diff --git a/kde-base/perlqt/perlqt-4.10.80.ebuild b/kde-base/perlqt/perlqt-4.10.80.ebuild
index 9e72097..a060753 100644
--- a/kde-base/perlqt/perlqt-4.10.80.ebuild
+++ b/kde-base/perlqt/perlqt-4.10.80.ebuild
@@ -27,7 +27,7 @@ DEPEND=${RDEPEND}
add_blocker kdebindings-perl
PATCHES=(
- "${FILESDIR}/${PN}-4.7.2-vendor.patch"
+ "${FILESDIR}/${PN}-4.10.80-vendor.patch"
)
src_configure() {
diff --git a/kde-base/perlqt/perlqt-9999.ebuild b/kde-base/perlqt/perlqt-9999.ebuild
index 570bb85..fcbb93b 100644
--- a/kde-base/perlqt/perlqt-9999.ebuild
+++ b/kde-base/perlqt/perlqt-9999.ebuild
@@ -27,7 +27,7 @@ DEPEND=${RDEPEND}
add_blocker kdebindings-perl
PATCHES=(
- "${FILESDIR}/${PN}-4.7.2-vendor.patch"
+ "${FILESDIR}/${PN}-4.10.80-vendor.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/perlqt/files/, kde-base/perlqt/
@ 2012-11-11 17:20 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2012-11-11 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 9e1c8d46eb982ce839c4e96303de0c242124857d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 17:17:23 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 17:18:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9e1c8d46
[kde-base/perlqt] All tests now pass.
Package-Manager: portage-2.1.11.31
---
kde-base/perlqt/files/perlqt-4.8.1-tests.patch | 21 ---------------------
kde-base/perlqt/perlqt-4.9.49.9999.ebuild | 1 -
kde-base/perlqt/perlqt-9999.ebuild | 1 -
3 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/kde-base/perlqt/files/perlqt-4.8.1-tests.patch b/kde-base/perlqt/files/perlqt-4.8.1-tests.patch
deleted file mode 100644
index a2fe9d0..0000000
--- a/kde-base/perlqt/files/perlqt-4.8.1-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN perlqt-4.8.1.orig/qtcore/t/CMakeLists.txt perlqt-4.8.1/qtcore/t/CMakeLists.txt
---- perlqt-4.8.1.orig/qtcore/t/CMakeLists.txt 2012-02-29 23:56:20.000000000 +0100
-+++ perlqt-4.8.1/qtcore/t/CMakeLists.txt 2012-04-01 17:41:58.071078670 +0200
-@@ -2,6 +2,6 @@
- macro_prove(perlqt_qtcore4_qapp ${CMAKE_CURRENT_SOURCE_DIR}/c_qapp.t)
- macro_prove(perlqt_qtcore4_sigslot ${CMAKE_CURRENT_SOURCE_DIR}/d_sigslot.t)
- macro_prove(perlqt_qtcore4_sigslot_inherit ${CMAKE_CURRENT_SOURCE_DIR}/e_sigslot_inherit.t)
--macro_prove(perlqt_qtcore4_handlers ${CMAKE_CURRENT_SOURCE_DIR}/f_handlers.t)
-+# macro_prove(perlqt_qtcore4_handlers ${CMAKE_CURRENT_SOURCE_DIR}/f_handlers.t)
-
- macro_prove(perlqt_qabstractitemmodel ${CMAKE_CURRENT_SOURCE_DIR}/qabstractitemmodel.t)
-diff -ruN perlqt-4.8.1.orig/qttest/t/CMakeLists.txt perlqt-4.8.1/qttest/t/CMakeLists.txt
---- perlqt-4.8.1.orig/qttest/t/CMakeLists.txt 2012-02-29 23:56:20.000000000 +0100
-+++ perlqt-4.8.1/qttest/t/CMakeLists.txt 2012-04-01 17:42:32.225079478 +0200
-@@ -1,5 +1,5 @@
- # Class tests
- macro_prove(perlqt_qttest4_load ${CMAKE_CURRENT_SOURCE_DIR}/a_loading.t)
-
--macro_prove(perlqt_qsignalspy ${CMAKE_CURRENT_SOURCE_DIR}/qsignalspy.t)
-+# macro_prove(perlqt_qsignalspy ${CMAKE_CURRENT_SOURCE_DIR}/qsignalspy.t)
- macro_prove(perlqt_qtesteventlist ${CMAKE_CURRENT_SOURCE_DIR}/qtesteventlist.t)
diff --git a/kde-base/perlqt/perlqt-4.9.49.9999.ebuild b/kde-base/perlqt/perlqt-4.9.49.9999.ebuild
index 3ad6375..a10d88c 100644
--- a/kde-base/perlqt/perlqt-4.9.49.9999.ebuild
+++ b/kde-base/perlqt/perlqt-4.9.49.9999.ebuild
@@ -28,7 +28,6 @@ add_blocker kdebindings-perl
PATCHES=(
"${FILESDIR}/${PN}-4.7.2-vendor.patch"
- "${FILESDIR}/${PN}-4.8.1-tests.patch"
)
src_configure() {
diff --git a/kde-base/perlqt/perlqt-9999.ebuild b/kde-base/perlqt/perlqt-9999.ebuild
index 3ad6375..a10d88c 100644
--- a/kde-base/perlqt/perlqt-9999.ebuild
+++ b/kde-base/perlqt/perlqt-9999.ebuild
@@ -28,7 +28,6 @@ add_blocker kdebindings-perl
PATCHES=(
"${FILESDIR}/${PN}-4.7.2-vendor.patch"
- "${FILESDIR}/${PN}-4.8.1-tests.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/perlqt/files/, kde-base/perlqt/
@ 2012-04-01 15:48 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2012-04-01 15:48 UTC (permalink / raw
To: gentoo-commits
commit: dfe6fb1369ee8db08526dd75dcab79a94e8cc3b2
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 1 15:48:09 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 1 15:48:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dfe6fb13
[kde-base/perlqt] Disable two failing tests (of 21), bug 392991
(Portage version: 2.1.10.52/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/perlqt/files/perlqt-4.8.1-tests.patch | 21 +++++++++++++++++++++
kde-base/perlqt/perlqt-4.8.49.9999.ebuild | 8 ++++----
kde-base/perlqt/perlqt-9999.ebuild | 8 ++++----
3 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/kde-base/perlqt/files/perlqt-4.8.1-tests.patch b/kde-base/perlqt/files/perlqt-4.8.1-tests.patch
new file mode 100644
index 0000000..a2fe9d0
--- /dev/null
+++ b/kde-base/perlqt/files/perlqt-4.8.1-tests.patch
@@ -0,0 +1,21 @@
+diff -ruN perlqt-4.8.1.orig/qtcore/t/CMakeLists.txt perlqt-4.8.1/qtcore/t/CMakeLists.txt
+--- perlqt-4.8.1.orig/qtcore/t/CMakeLists.txt 2012-02-29 23:56:20.000000000 +0100
++++ perlqt-4.8.1/qtcore/t/CMakeLists.txt 2012-04-01 17:41:58.071078670 +0200
+@@ -2,6 +2,6 @@
+ macro_prove(perlqt_qtcore4_qapp ${CMAKE_CURRENT_SOURCE_DIR}/c_qapp.t)
+ macro_prove(perlqt_qtcore4_sigslot ${CMAKE_CURRENT_SOURCE_DIR}/d_sigslot.t)
+ macro_prove(perlqt_qtcore4_sigslot_inherit ${CMAKE_CURRENT_SOURCE_DIR}/e_sigslot_inherit.t)
+-macro_prove(perlqt_qtcore4_handlers ${CMAKE_CURRENT_SOURCE_DIR}/f_handlers.t)
++# macro_prove(perlqt_qtcore4_handlers ${CMAKE_CURRENT_SOURCE_DIR}/f_handlers.t)
+
+ macro_prove(perlqt_qabstractitemmodel ${CMAKE_CURRENT_SOURCE_DIR}/qabstractitemmodel.t)
+diff -ruN perlqt-4.8.1.orig/qttest/t/CMakeLists.txt perlqt-4.8.1/qttest/t/CMakeLists.txt
+--- perlqt-4.8.1.orig/qttest/t/CMakeLists.txt 2012-02-29 23:56:20.000000000 +0100
++++ perlqt-4.8.1/qttest/t/CMakeLists.txt 2012-04-01 17:42:32.225079478 +0200
+@@ -1,5 +1,5 @@
+ # Class tests
+ macro_prove(perlqt_qttest4_load ${CMAKE_CURRENT_SOURCE_DIR}/a_loading.t)
+
+-macro_prove(perlqt_qsignalspy ${CMAKE_CURRENT_SOURCE_DIR}/qsignalspy.t)
++# macro_prove(perlqt_qsignalspy ${CMAKE_CURRENT_SOURCE_DIR}/qsignalspy.t)
+ macro_prove(perlqt_qtesteventlist ${CMAKE_CURRENT_SOURCE_DIR}/qtesteventlist.t)
diff --git a/kde-base/perlqt/perlqt-4.8.49.9999.ebuild b/kde-base/perlqt/perlqt-4.8.49.9999.ebuild
index d9b6328..695282d 100644
--- a/kde-base/perlqt/perlqt-4.8.49.9999.ebuild
+++ b/kde-base/perlqt/perlqt-4.8.49.9999.ebuild
@@ -26,10 +26,10 @@ DEPEND=${RDEPEND}
# Split from kdebindings-perl in 4.7
add_blocker kdebindings-perl
-RESTRICT="test"
-# bug 392991
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.7.2-vendor.patch"
+ "${FILESDIR}/${PN}-4.8.1-tests.patch"
+)
src_configure() {
local mycmakeargs=(
diff --git a/kde-base/perlqt/perlqt-9999.ebuild b/kde-base/perlqt/perlqt-9999.ebuild
index d9b6328..695282d 100644
--- a/kde-base/perlqt/perlqt-9999.ebuild
+++ b/kde-base/perlqt/perlqt-9999.ebuild
@@ -26,10 +26,10 @@ DEPEND=${RDEPEND}
# Split from kdebindings-perl in 4.7
add_blocker kdebindings-perl
-RESTRICT="test"
-# bug 392991
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.7.2-vendor.patch"
+ "${FILESDIR}/${PN}-4.8.1-tests.patch"
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/perlqt/files/, kde-base/perlqt/
@ 2011-10-18 23:12 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2011-10-18 23:12 UTC (permalink / raw
To: gentoo-commits
commit: d3b7c1df548dec8a5b4d962ff86092c82a2564e8
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Tue Oct 18 23:11:45 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 23:12:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d3b7c1df
[kde-base/perlqt] vendor-perl, not site-perl
(Portage version: 2.1.10.28/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
kde-base/perlqt/ChangeLog | 9 +++++++++
kde-base/perlqt/files/perlqt-4.7.2-vendor.patch | 12 ++++++++++++
kde-base/perlqt/perlqt-4.7.49.9999.ebuild | 2 ++
kde-base/perlqt/perlqt-9999.ebuild | 2 ++
4 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/kde-base/perlqt/ChangeLog b/kde-base/perlqt/ChangeLog
new file mode 100644
index 0000000..825daa0
--- /dev/null
+++ b/kde-base/perlqt/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for kde-base/perlqt
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 18 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +files/perlqt-4.7.2-vendor.patch, perlqt-4.7.49.9999.ebuild,
+ perlqt-9999.ebuild:
+ [kde-base/perlqt] vendor-perl, not site-perl
+
diff --git a/kde-base/perlqt/files/perlqt-4.7.2-vendor.patch b/kde-base/perlqt/files/perlqt-4.7.2-vendor.patch
new file mode 100644
index 0000000..3320560
--- /dev/null
+++ b/kde-base/perlqt/files/perlqt-4.7.2-vendor.patch
@@ -0,0 +1,12 @@
+diff -ruN perlqt-4.7.2.orig/CMakeLists.txt perlqt-4.7.2/CMakeLists.txt
+--- perlqt-4.7.2.orig/CMakeLists.txt 2011-05-20 22:33:46.000000000 +0200
++++ perlqt-4.7.2/CMakeLists.txt 2011-10-19 01:03:04.040639531 +0200
+@@ -38,7 +38,7 @@
+ add_definitions(-DDEBUG)
+
+ include (FindPerlMore)
+-set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
++set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_VENDOR_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
+
+ # the RPATH to be used when installing, but only if it's not a system directory
+ GET_FILENAME_COMPONENT(SMOKE_LIB_DIR ${SMOKE_BASE_LIBRARY} PATH)
diff --git a/kde-base/perlqt/perlqt-4.7.49.9999.ebuild b/kde-base/perlqt/perlqt-4.7.49.9999.ebuild
index dfe8673..5c100d1 100644
--- a/kde-base/perlqt/perlqt-4.7.49.9999.ebuild
+++ b/kde-base/perlqt/perlqt-4.7.49.9999.ebuild
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
# Split from kdebindings-perl in 4.7
add_blocker kdebindings-perl
+PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
+
src_configure() {
local mycmakeargs=(
-DDISABLE_Qt3Support=ON
diff --git a/kde-base/perlqt/perlqt-9999.ebuild b/kde-base/perlqt/perlqt-9999.ebuild
index dfe8673..5c100d1 100644
--- a/kde-base/perlqt/perlqt-9999.ebuild
+++ b/kde-base/perlqt/perlqt-9999.ebuild
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
# Split from kdebindings-perl in 4.7
add_blocker kdebindings-perl
+PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
+
src_configure() {
local mycmakeargs=(
-DDISABLE_Qt3Support=ON
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-06-20 1:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-20 1:42 [gentoo-commits] proj/kde:master commit in: kde-base/perlqt/files/, kde-base/perlqt/ Jonathan Callen
-- strict thread matches above, loose matches on Subject: below --
2012-11-11 17:20 Michael Palimaka
2012-04-01 15:48 Andreas Hüttel
2011-10-18 23:12 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox