[gentoo-commits] proj/kde-sunset:master commit in: dev-libs/libdbusmenu-qt/
commit: e249e40f789cfd533c18c863d823deca2f0044a2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Sep 7 17:54:08 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Sep 7 17:54:08 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=e249e40f
dev-libs/libdbusmenu-qt: Drop 0.9.3_pre20160218-r1
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild | 124 -
1 file changed, 124 deletions(-)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
deleted file mode 100644
index b8d06d40..
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EBZR_REPO_URI="lp:libdbusmenu-qt"
-
-[[ ${PV} == * ]] && inherit bzr
-inherit cmake-multilib multibuild virtualx
-
-DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
-HOMEPAGE="https://launchpad.net/libdbusmenu-qt/;
-if [[ ${PV} != * ]] ; then
- MY_PV=${PV/_pre/+16.04.}
-
SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz;
- KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug qt4"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- qt4? (
- >=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
- >=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
- >=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
- )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qttest:5
- qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
- )
-"
-
-[[ ${PV} == * ]] || S=${WORKDIR}/${PN}-${MY_PV}
-
-DOCS=( NEWS README )
-
-# tests fail due to missing connection to dbus
-RESTRICT="test"
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usex qt4 4) 5 )
-}
-
-src_prepare() {
- [[ ${PV} == * ]] && bzr_src_prepare
- cmake-utils_src_prepare
-
- cmake_comment_add_subdirectory tools
- use test || cmake_comment_add_subdirectory tests
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DWITH_DOC=OFF
- -DUSE_QT${QT_MULTIBUILD_VARIANT}=ON
-
-DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt${QT_MULTIBUILD_VARIANT}/bin/qmake"
- )
- cmake-utils_src_configure
-}
-
-src_configure() {
- myconfigure() {
- local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
- if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
- cmake-multilib_src_configure
- elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
- multilib_src_configure
- fi
- }
-
- multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
- mycompile() {
- if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
- cmake-multilib_src_compile
- elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
- cmake-utils_src_compile
- fi
- }
-
- multibuild_foreach_variant mycompile
-}
-
-src_install() {
- myinstall() {
- if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
- cmake-multilib_src_install
- elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
- cmake-utils_src_install
- fi
- }
-
- multibuild_foreach_variant myinstall
-}
-
-src_test() {
- mytest() {
- if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
- cmake-multilib_src_test
- elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
- multilib_src_test
- fi
- }
-
- multibuild_foreach_variant mytest
-}
-
-multilib_src_test() {
- local builddir=${BUILD_DIR}
-
- BUILD_DIR=${BUILD_DIR}/tests virtx cmake-utils_src_test
-
- BUILD_DIR=${builddir}
-}
[gentoo-commits] proj/kde-sunset:master commit in: dev-libs/libdbusmenu-qt/files/, dev-libs/libdbusmenu-qt/
commit: a133cf0b9aa18165d667d85a2a797599d28c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Sep 7 17:48:48 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Sep 7 17:48:48 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=a133cf0b
dev-libs/libdbusmenu-qt: Import latest version with IUSE="qt4,qt5"
This package will most likely reach EOL with Qt5 anyway.
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../libdbusmenu-qt-0.9.3_pre20160218-cmake.patch | 258 +
.../libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild | 95
2 files changed, 353 insertions(+)
diff --git
a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20160218-cmake.patch
b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20160218-cmake.patch
new file mode 100644
index ..e4668a52
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20160218-cmake.patch
@@ -0,0 +1,258 @@
+From 56669bd4e5ed21cfd2b0f5b94983792396695e5e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 17 Feb 2019 19:10:55 +0100
+Subject: [PATCH] Use more GNUInstallDirs, fix pkgconfig libdir path, general
+ cleanup
+
+---
+ CMakeLists.txt| 45 ---
+ cmake/modules/FindQJSON.cmake | 2 +-
+ dbusmenu-qt-config.cmake.in | 2 +-
+ dbusmenu-qt.pc.in | 6 ++---
+ src/CMakeLists.txt| 16 ++---
+ tests/CMakeLists.txt | 10
+ tools/testapp/CMakeLists.txt | 2 +-
+ 7 files changed, 34 insertions(+), 49 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72cbc45..2d757ec 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.11)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_SOURCE_DIR}/cmake/modules")
+
+ # Build options
+-option(WITH_DOC "Build documentation (requires Doxygen)" ON)
++option(WITH_DOC "Build documentation (requires Doxygen)" OFF)
+
+ # Versions
+ ## Package version
+@@ -24,28 +24,8 @@ set(dbusmenu_qt_lib_PATCH_VERSION 0)
+
+ set(dbusmenu_qt_lib_VERSION
${dbusmenu_qt_lib_SOVERSION}.${dbusmenu_qt_lib_API_VERSION}.${dbusmenu_qt_lib_PATCH_VERSION})
+
+-# Check if we want to explicitly select the Qt version to be used or
autodetect
+-if (NOT USE_QT4 AND NOT USE_QT5)
+-# Autodetect, prefering Qt5
+-message(STATUS "Autodetecting Qt version to use")
+-find_package(Qt5Widgets QUIET)
+-if (Qt5Widgets_FOUND)
+-set(USE_QT5 TRUE)
+-endif()
+-endif()
+-
+ # Detect for which Qt version we're building
+-if (USE_QT5)
+-find_package(Qt5Widgets REQUIRED)
+-find_package(Qt5DBus REQUIRED)
+-include_directories(${Qt5Widgets_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS})
+-find_package(Qt5Core REQUIRED)
+-set(CMAKE_AUTOMOC ON)
+-set(CMAKE_AUTOMOC_RELAXED_MODE ON)
+-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+-
+-set(QT_SUFFIX "qt5")
+-else()
++if (USE_QT4)
+ find_package(Qt4 REQUIRED)
+ include_directories(
+ ${QT_INCLUDE_DIR}
+@@ -55,6 +35,14 @@ else()
+ )
+
+ set(QT_SUFFIX "qt")
++else()
++find_package(Qt5 CONFIG REQUIRED Core DBus Widgets)
++include_directories(${Qt5Widgets_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS})
++set(CMAKE_AUTOMOC ON)
++set(CMAKE_AUTOMOC_RELAXED_MODE ON)
++set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++
++set(QT_SUFFIX "qt5")
+ endif()
+
+ include (CheckCXXCompilerFlag)
+@@ -76,9 +64,7 @@ endif (__DBUSMENU_HAVE_CXX11)
+
+ include(CMakePackageConfigHelpers)
+ include(GNUInstallDirs)
+-set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-set(CMAKECONFIG_INSTALL_DIR "${LIB_DESTINATION}/cmake/dbusmenu-${QT_SUFFIX}")
+-set(INCLUDE_INSTALL_DIR "include/dbusmenu-${QT_SUFFIX}")
++set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-${QT_SUFFIX}")
+
+ # dist targets
+ set(ARCHIVE_NAME libdbusmenu-${QT_SUFFIX}-${dbusmenu_qt_VERSION})
+@@ -103,7 +89,7 @@ add_dependencies(distcheck dist)
+ configure_file(dbusmenu-qt.pc.in ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}.pc
@ONLY)
+
+ install(FILES ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}.pc
+-DESTINATION ${LIB_DESTINATION}/pkgconfig
++DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ )
+
+ add_subdirectory(src)
+@@ -118,7 +104,7 @@ if(WITH_DOC)
+ )
+
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/html/
+-DESTINATION share/doc/libdbusmenu-${QT_SUFFIX}-doc
++DESTINATION ${CMAKE_INSTALL_DOCDIR}
+ )
+ endif(WITH_DOC)
+
+@@ -126,8 +112,8 @@ endif(WITH_DOC)
+ configure_package_config_file(
+ dbusmenu-qt-config.cmake.in
+ ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}-config.cmake
+-INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
++INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dbusmenu-${QT_SUFFIX}
+ PATH_VARS INCLUDE_INSTALL_DIR
+ )
+
+ write_basic_package_version_file(
+@@ -140,6 +126,6 @@
[gentoo-commits] proj/kde-sunset:master commit in: dev-libs/libdbusmenu-qt/
commit: 005181a742b2481e49936bfce969ce3928dd6bd7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 10 13:21:52 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 10 13:21:52 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=005181a7
dev-libs/libdbusmenu-qt: Import from Gentoo ebuild repo
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild | 124 +
dev-libs/libdbusmenu-qt/metadata.xml | 8 ++
2 files changed, 132 insertions(+)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
new file mode 100644
index 000..c3d4931
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EBZR_REPO_URI="lp:libdbusmenu-qt"
+
+[[ ${PV} == * ]] && inherit bzr
+inherit cmake-multilib multibuild virtualx
+
+DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
+HOMEPAGE="https://launchpad.net/libdbusmenu-qt/;
+if [[ ${PV} != * ]] ; then
+ MY_PV=${PV/_pre/+16.04.}
+
SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz;
+ KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug qt4"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ qt4? (
+ >=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-qt/qttest:5
+ qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
+ )
+"
+
+[[ ${PV} == * ]] || S=${WORKDIR}/${PN}-${MY_PV}
+
+DOCS=( NEWS README )
+
+# tests fail due to missing connection to dbus
+RESTRICT="test"
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usex qt4 4) 5 )
+}
+
+src_prepare() {
+ [[ ${PV} == * ]] && bzr_src_prepare
+ cmake-utils_src_prepare
+
+ cmake_comment_add_subdirectory tools
+ use test || cmake_comment_add_subdirectory tests
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DWITH_DOC=OFF
+ -DUSE_QT${QT_MULTIBUILD_VARIANT}=ON
+
-DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt${QT_MULTIBUILD_VARIANT}/bin/qmake"
+ )
+ cmake-utils_src_configure
+}
+
+src_configure() {
+ myconfigure() {
+ local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
+ if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+ cmake-multilib_src_configure
+ elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+ multilib_src_configure
+ fi
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ mycompile() {
+ if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+ cmake-multilib_src_compile
+ elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+ cmake-utils_src_compile
+ fi
+ }
+
+ multibuild_foreach_variant mycompile
+}
+
+src_install() {
+ myinstall() {
+ if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+ cmake-multilib_src_install
+ elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+ cmake-utils_src_install
+ fi
+ }
+
+ multibuild_foreach_variant myinstall
+}
+
+src_test() {
+ mytest() {
+ if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+ cmake-multilib_src_test
+ elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+ multilib_src_test
+ fi
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+multilib_src_test() {
+ local builddir=${BUILD_DIR}
+
+ BUILD_DIR=${BUILD_DIR}/tests virtx cmake-utils_src_test
+
+ BUILD_DIR=${builddir}
+}
diff --git a/dev-libs/libdbusmenu-qt/metadata.xml
b/dev-libs/libdbusmenu-qt/metadata.xml
new file mode 100644
index 000..0cb1ad9
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+
+ ubuntu
+
+
