cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Qt4 x11/dbusmenu-qt

Browse Source 
- Remove and add quirk for dbusmenu-qt (Qt4).
- Set PKGNAME to dbusmenu-qt5
- Set conflict and pkgpath
- bump all consumers
This commit is contained in:
rsadowski 2020-08-20 16:40:47 +00:00
parent 6cd6db194e
commit 6ebd9b8226
7 changed files with 38 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/kf5/knotifications/Makefile
View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2020/03/23 18:01:09 rsadowski Exp $
# $OpenBSD: Makefile,v 1.14 2020/08/20 16:40:47 rsadowski Exp $
COMMENT = KDE desktop notifications framework
DISTNAME = knotifications-${VERSION}
REVISION = 0
SHARED_LIBS = KF5Notifications 5.0
@ -13,7 +14,7 @@ LIB_DEPENDS = audio/libcanberra \
devel/kf5/kconfig>=${MODKF5_VERSION} \
devel/kf5/kcoreaddons>=${MODKF5_VERSION} \
devel/kf5/kwindowsystem>=${MODKF5_VERSION} \
x11/dbusmenu-qt,qt5 \
x11/dbusmenu-qt \
x11/qt5/qtx11extras
PORTHOME = ${WRKDIR}

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1013 2020/08/20 16:24:41 rsadowski Exp $
# $OpenBSD: Makefile,v 1.1014 2020/08/20 16:40:47 rsadowski Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-3.405
PKGNAME = quirks-3.406
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.1031 2020/08/20 16:24:41 rsadowski Exp $
# $OpenBSD: Quirks.pm,v 1.1032 2020/08/20 16:40:47 rsadowski Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -1781,6 +1781,7 @@ my $obsolete_reason = {
'uim-kde' => 1,
'uim-qt' => 1,
'uim-qt4' => 1,
'dbusmenu-qt' => 5,
};
# reasons for obsolete packages

39
x11/dbusmenu-qt/Makefile
View File

@ -1,51 +1,32 @@
# $OpenBSD: Makefile,v 1.14 2020/02/19 05:58:26 rsadowski Exp $
# $OpenBSD: Makefile,v 1.15 2020/08/20 16:40:47 rsadowski Exp $
COMMENT = D-Bus menu implementation for Qt
V = 0.9.3
DISTNAME = libdbusmenu-qt_${V}+16.04.20160218
PKGNAME = ${PKGSTEM}-${V}
FULLPKGNAME = ${PKGNAME}
PKGNAME = dbusmenu-qt5-${V}
CATEGORIES = x11 devel
HOMEPAGE = https://launchpad.net/libdbusmenu-qt/
MAINTAINER = KDE porting team <openbsd-kde@googlegroups.com>
REVISION = 5
REVISION = 6
SHARED_LIBS = dbusmenu-qt 1.0 # 2.7
SHARED_LIBS += dbusmenu-qt5 1.0 # 2.7
# LGPLv2
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Widgets
WANTLIB += m
MASTER_SITES = http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu-qt/
EXTRACT_SUFX = .orig.tar.gz
MODULES = devel/cmake
MODULES = devel/cmake \
x11/qt5
FLAVORS = qt5
FLAVOR ?=
# XXX run update-plist with qt5 FLAVOR, or it'll go crazy
WANTLIB += ${COMPILER_LIBCXX}
.if ${FLAVOR:Mqt5}
MODULES += x11/qt5
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Widgets m
CONFIGURE_ARGS= -DUSE_QT4=OFF \
-DUSE_QT5=ON \
-DWITH_DOC=OFF \
-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON
PKGSTEM = dbusmenu-qt5
.else
MODULES += x11/qt4
COMPILER = base-clang ports-gcc
WANTLIB += QtDBus QtGui m
CONFIGURE_ARGS= -DUSE_QT4=Yes -DUSE_QT5=No
PKGSTEM = dbusmenu-qt
BUILD_DEPENDS = devel/qjson
TEST_DEPENDS = devel/qjson
.endif
CONFIGURE_ARGS += -DWITH_DOC=OFF
# XXX "!icon.isNull()" failed tests are normal, they do mean that
# mentioned icon is not installed; e.g., these are the test bugs.
@ -54,6 +35,4 @@ TEST_IS_INTERACTIVE = X11
WRKDIST = ${WRKDIR}/${DISTNAME:C/_/-/}
SUBST_VARS = PKGSTEM
.include <bsd.port.mk>

29
x11/dbusmenu-qt/pkg/PLIST
View File

@ -1,13 +1,16 @@
@comment $OpenBSD: PLIST,v 1.5 2016/12/19 11:55:56 zhuk Exp $
include/${PKGSTEM}/
include/${PKGSTEM}/dbusmenu_export.h
include/${PKGSTEM}/dbusmenu_version.h
include/${PKGSTEM}/dbusmenuexporter.h
include/${PKGSTEM}/dbusmenuimporter.h
lib/cmake/${PKGSTEM}/
lib/cmake/${PKGSTEM}/${PKGSTEM}-config-version.cmake
lib/cmake/${PKGSTEM}/${PKGSTEM}-config.cmake
lib/cmake/${PKGSTEM}/${PKGSTEM}-targets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/${PKGSTEM}/${PKGSTEM}-targets.cmake
@lib lib/lib${PKGSTEM}.so.${LIB${PKGSTEM}_VERSION}
lib/pkgconfig/${PKGSTEM}.pc
@comment $OpenBSD: PLIST,v 1.6 2020/08/20 16:40:47 rsadowski Exp $
@conflict dbusmenu-qt-*
@pkgpath x11/dbusmenu-qt,qt5
include/dbusmenu-qt5/
include/dbusmenu-qt5/dbusmenu_export.h
include/dbusmenu-qt5/dbusmenu_version.h
include/dbusmenu-qt5/dbusmenuexporter.h
include/dbusmenu-qt5/dbusmenuimporter.h
lib/cmake/
lib/cmake/dbusmenu-qt5/
lib/cmake/dbusmenu-qt5/dbusmenu-qt5-config-version.cmake
lib/cmake/dbusmenu-qt5/dbusmenu-qt5-config.cmake
lib/cmake/dbusmenu-qt5/dbusmenu-qt5-targets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/dbusmenu-qt5/dbusmenu-qt5-targets.cmake
@lib lib/libdbusmenu-qt5.so.${LIBdbusmenu-qt5_VERSION}
lib/pkgconfig/dbusmenu-qt5.pc

6
x11/lxqt/panel/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2019/05/05 17:09:07 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2020/08/20 16:40:47 rsadowski Exp $
COMMENT = desktop panel for LXQt
@ -6,7 +6,7 @@ VERSION = 0.13.0
NAME = lxqt-panel
DISTNAME = ${NAME}-${VERSION}
REVISION = 1
REVISION = 2
WANTLIB += ${COMPILER_LIBCXX} ICE KF5Solid KF5WindowSystem Qt5Core
WANTLIB += Qt5DBus Qt5Gui Qt5Svg Qt5Widgets Qt5X11Extras Qt5Xdg
@ -20,7 +20,7 @@ LIB_DEPENDS += x11/lxqt/liblxqt \
x11/lxqt/libsysstat \
sysutils/libstatgrab \
devel/kf5/solid \
x11/dbusmenu-qt,qt5
x11/dbusmenu-qt
BUILD_DEPENDS += x11/lxqt/build-tools

6
x11/lxqt/qtplugin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2019/05/05 17:09:08 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2020/08/20 16:40:47 rsadowski Exp $
COMMENT = qt platform integration plugin for LXQt
@ -6,7 +6,7 @@ VERSION = 0.13.0
NAME = lxqt-qtplugin
DISTNAME = ${NAME}-${VERSION}
REVISION = 1
REVISION = 2
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Svg Qt5Widgets
WANTLIB += Qt5X11Extras Qt5XdgIconLoader dbusmenu-qt5 exif fm
@ -16,7 +16,7 @@ WANTLIB += m menu-cache xcb
LIB_DEPENDS += x11/qt5/qtx11extras \
x11/lxqt/libqtxdg \
x11/lxqt/libfm-qt \
x11/dbusmenu-qt,qt5
x11/dbusmenu-qt
BUILD_DEPENDS += x11/lxqt/build-tools